Commit graph

3648 commits

Author SHA1 Message Date
Jeremy Benoist
7d1d961267
Merge remote-tracking branch 'origin/master' into 2.3 2017-03-28 14:07:42 +02:00
Jérémy Benoist
6ae579e43f Merge pull request #2861 from wallabag/2.3-droping-5.5
Dropping PHP 5.5
2017-03-28 13:18:17 +02:00
Nicolas Lœuillet
de0ab52a47
Updated requirements in documentation 2017-03-28 11:45:40 +02:00
Nicolas Lœuillet
90f95027a8 Merge pull request #2985 from etiess/patch-2
Update paywall.rst (more details and clear cache)
2017-03-23 13:56:55 +01:00
Nicolas Lœuillet
7423ed4766 Merge pull request #2968 from chrido/master
remove language on html tag
2017-03-13 10:56:33 +01:00
Jérémy Benoist
3f5f303e7f Merge pull request #2971 from etiess/patch-3
Update paywall.rst (EN) with details + clear cache
2017-03-09 15:34:40 +01:00
Christoph Doblander
cee28dc6d4 remove language on html-tag 2017-03-06 21:34:50 +01:00
Nicolas Lœuillet
8c565e3b73 Merge pull request #2954 from wallabag/update-version
Changed wallabag version
2017-03-02 14:43:04 +01:00
Nicolas Lœuillet
8ef1df8157
Changed wallabag version 2017-03-02 14:42:16 +01:00
Nicolas Lœuillet
0fe64f1fdd Merge pull request #2916 from wallabag/update-changelog
Updated CHANGELOG with latest changes
2017-03-02 14:40:22 +01:00
Nicolas Lœuillet
bae1f9dfba Updated CHANGELOG with latest changes 2017-03-02 14:22:17 +01:00
Nicolas Lœuillet
6c79aaf432 Merge pull request #2950 from wallabag/fix-symlinks
Fixed symlinks issue during release creation
2017-03-02 14:16:51 +01:00
Nicolas Lœuillet
1d13376df6
Fixed symlinks issue during release creation 2017-03-01 14:17:07 +01:00
Nicolas Lœuillet
71460a8ba5 Merge pull request #2926 from qtheuret/master
Add activation of 'rewrite' mod of Apache
2017-03-01 13:32:46 +01:00
Nicolas Lœuillet
e1cc8fd799 Merge pull request #2919 from wallabag/api-exists-returns-id
Api exists returns
2017-02-28 21:12:30 +01:00
Nicolas Lœuillet
3529ce35e4
Added german and italian translation 2017-02-28 21:10:24 +01:00
Nicolas Lœuillet
29969f854c Merge pull request #2932 from wallabag/mruminski-patch-1
Update Polish translation
2017-02-25 08:28:31 +01:00
Mateusz Rumiński
78bce602cb Update Polish translation
add missing translation
2017-02-24 18:31:35 +01:00
Jeremy Benoist
85b4b6e0cd Merge pull request #2931 from wallabag/php-7.1
Use wallabag/tcpdf
2017-02-24 16:23:06 +01:00
Jeremy Benoist
5a73f94590
Use wallabag/tcpdf
It should restore the PHP 7.1 compatibility
2017-02-24 15:05:45 +01:00
Thomas Citharel
ca9a83ee51 return id of article instead of true if entry exists 2017-02-24 11:31:31 +01:00
Quentin THEURET
0a82d6e23c Activate 'rewrite' mod of Apache 2017-02-23 16:10:14 +01:00
Quentin THEURET
a737f4b58e Ajout du mod 'rewrite' de Apache 2017-02-23 16:09:06 +01:00
etiess
5301d664d9 Update paywall.rst (EN) with details + clear cache 2017-02-23 08:54:33 +01:00
etiess
e316d4bd34 Update paywall.rst (more details and clear cache) 2017-02-22 11:49:45 +01:00
Jeremy Benoist
227a009da5 Merge pull request #2917 from ngosang/feature/es_translation_2
Update Spanish translation
2017-02-20 13:55:24 +01:00
ngosang
ac47889928 Update Spanish translation 2017-02-20 12:21:02 +01:00
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