Commit graph

3671 commits

Author SHA1 Message Date
Nicolas Lœuillet 6914fdd8d8 Merge pull request #2915 from wallabag/import-drop-msg-user-null
Import: we now skip messages when user is null
2017-02-20 09:45:12 +01:00
Nicolas Lœuillet b45b6b6707
Import: we now skip messages when user is null 2017-02-20 09:16:02 +01:00
Nicolas Lœuillet 48be826ea9 Merge pull request #2905 from nicofrand/patch-1
Alert that 2FA must be authorized in app/config/parameters.yml
2017-02-20 08:27:26 +01:00
Nicolas Lœuillet b17cb92e9b Merge pull request #2913 from wallabag/add-wllbgit-readme
Added wallabag.it link in README
2017-02-20 08:05:58 +01:00
Nicolas Frandeboeuf 38fe541997 Alert that 2FA must be authorized in app/config/parameters.yml 2017-02-20 08:04:44 +01:00
Jeremy Benoist bba94d7458 Merge pull request #2832 from Kdecherf/search-domain
Search by term: extend to entries url
2017-02-19 21:52:35 +01:00
Nicolas Lœuillet b678d0f55c
Added wallabag.it link in README 2017-02-18 15:04:57 +01:00
Nicolas Lœuillet 2b8f274b8a Merge pull request #2911 from wallabag/jlnostr-patch-1
Remove word repetition from german translation
2017-02-17 22:16:48 +01:00
Julian Oster 5d858d21de Remove word repetition from german translation
see https://github.com/wallabag/wallabag/pull/2882#discussion_r101806434
2017-02-17 21:52:16 +01:00
Nicolas Lœuillet 628f9d31de Merge pull request #2908 from wallabag/move-it-documentatin
Moved 🇮🇹 documentation into it folder
2017-02-17 13:54:48 +01:00
Nicolas Lœuillet 9d8975f6b6
Moved 🇮🇹 documentation into it folder 2017-02-17 13:12:09 +01:00
Nicolas Lœuillet 2edc539581 Merge pull request #2830 from Kdecherf/striptags-title
Fix rendering of entry title in Twig views
2017-02-17 09:28:56 +01:00
Nicolas Lœuillet 2ac8e2c5b5 Merge pull request #2882 from wallabag/add-translations-doc-mobile-apps
Doc: translated mobile apps configuration in french
2017-02-17 09:28:21 +01:00
Kevin Decherf eac09b48b0 Search by term: extend to entries url
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-16 21:47:52 +01:00
Julian Oster 9dd68dae77 Some changes to 🇩🇪 translation 2017-02-16 21:41:19 +01:00
Kevin Decherf aedd385e10 views: cosmetic in share links href
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-16 21:36:34 +01:00
Jeremy Benoist 6c1c433903 Merge pull request #2892 from ngosang/feature/es_translation
Update Spanish translation
2017-02-16 09:12:40 +01:00
Sven Fischer 8b42e75f68 add 🇩🇪 doc user/configuring_mobile 2017-02-15 17:13:14 +01:00
ngosang 82749439ac Update Spanish translation 2017-02-15 15:41:06 +01:00
Nicolas Lœuillet a92718dba2 Merge pull request #2875 from kgaut/patch-3
Doc - information about Apache 2.4
2017-02-14 22:14:51 +01:00
Nicolas Lœuillet 2414eb12c6 Merge pull request #2785 from matteocoder/patch-2
first_article.rst already inside articles.rst
2017-02-14 22:05:53 +01:00
Nicolas Lœuillet f3c7e055f2 Merge pull request #2784 from matteocoder/patch-1
Doc: share.rst already integrated inside articles.rst
2017-02-14 21:37:27 +01:00
matteocoder e04d656f5a first_article.rst already inside articles.rst
The file is a duplicate of a section already present in articles.rst
2017-02-14 20:57:22 +01:00
matteocoder d60c38edf9 share.rst already integrated inside articles.rst
The share.rst file is just a duplicate of a section already present in another file.
2017-02-14 20:56:27 +01:00
Nicolas Lœuillet 7d1c19c021
Doc: translated mobile apps configuration in french 2017-02-14 20:45:08 +01:00
Nicolas Lœuillet f17b89fadc Merge pull request #2878 from matteocoder/wallabag-docs-ita
Italian documentation added
2017-02-14 18:33:43 +01:00
Nicolas Lœuillet eef47c0ead Merge pull request #2879 from matteocoder/matteocoder-patch-1
Fixed typo in "first_steps"
2017-02-14 17:16:14 +01:00
matteocoder 5601b4536c Italian documentation added
There are some missing links in various articles. Please let me know how I can fix this :)
2017-02-14 16:36:40 +01:00
Nicolas Lœuillet 6d1e97f564 Merge pull request #2860 from wallabag/docs-update-3rd-party-apps
docs 3rd party tools: update java wrapper, add cmd tool to add article
2017-02-14 15:40:29 +01:00
Sven Fischer c772c473a1 docs: add 3rd party app wallabako for Kobo readers 2017-02-14 15:39:12 +01:00
Kevin Gautreau 0ae5297699 Doc - informations about Apache 2.4 2017-02-14 15:29:33 +01:00
Nicolas Lœuillet 5e4b9b2321 Merge pull request #2874 from kgaut/patch-2
Add informations about Apache 2.4
2017-02-14 15:11:08 +01:00
Kevin Gautreau 947ccd075c Add informations about Apache 2.4 2017-02-14 09:24:56 +01:00
Thomas Citharel 4a953a250c Merge pull request #2869 from wallabag/log-restricted-access
Log restricted access value
2017-02-13 14:55:55 +01:00
Jeremy Benoist 7bf6b555f5
Log restricted access value
It might help to figure out if we have enabled it or not
2017-02-13 14:20:03 +01:00
Jeremy Benoist 4cb9e0aad1
Dropping PHP 5.5 2017-02-11 12:02:35 +01:00
Sven Fischer 8148675cb7 docs 3rd party tools: update java wrapper, add cmd tool to add article 2017-02-11 00:43:04 +01:00
Jeremy Benoist abba55cdd6 Merge pull request #2846 from wallabag/mruminski-patch-1
fix misspells in polish translation
2017-02-06 17:29:31 +01:00
Mateusz Rumiński 41ed68d5b0 fix misspells in polish translation 2017-02-06 15:38:33 +01:00
Jeremy Benoist 99cc170b0e Merge pull request #2842 from K-Phoen/update-rulerz
Update RulerZ
2017-02-06 09:20:28 +01:00
Jeremy Benoist 10caff9875 Merge pull request #2841 from Kdecherf/active-menu-search
Show active list in the left menu during search
2017-02-05 21:08:39 +01:00
Kévin Gomez 177c5510ff Update RulerZ 2017-02-05 18:02:09 +01:00
Kevin Decherf 7d9a67de14 Show active list in the left menu during search
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-02-05 15:19:52 +01:00
Jeremy Benoist 20da238413 Merge pull request #2788 from Zettt/master
Documentation on how to configure mobile apps to work with wallabag.it
2017-02-05 12:49:43 +01:00
Andreas Zeitler 664621955d
Added configuration documentation for mobile apps 2017-02-05 12:48:30 +01:00
Jeremy Benoist 15a4d52833 Merge pull request #2839 from foxmask/master
scripts/update.sh: 18: scripts/update.sh: composer.phar: not found
2017-02-05 12:34:20 +01:00
Jeremy Benoist 5397d820fe Merge pull request #2838 from wallabag/Quent-in-patch-1
Update Oc version
2017-02-04 21:54:43 +01:00
Jeremy Benoist 6837c3989a Merge pull request #2840 from wallabag/fix-frameworkbundle
Restored correct version for framework-extra-bundle
2017-02-04 21:53:26 +01:00
Nicolas Lœuillet 7db1bdf1e4 Restored correct version for framework-extra-bundle
The bundle was fixed in latest version.
2017-02-04 18:26:16 +01:00
FoxMaSk 205c6f0c66 scripts/update.sh: 18: scripts/update.sh: composer.phar: not found
when composer.phar is not globally installed, we should add "./" in front of "composer.phar" to run it from the current folder.
2017-02-04 17:02:25 +01:00