Jeremy Benoist
d7acde5cc3
Use the correct template
...
When resetting the password, the overriden template we used wasn’t well spelled.
And since we are using a locked version of FOSUser (on a custom commit), the translation of `resetting.check_email` is wrong in any language but english.
2016-11-22 21:23:58 +01:00
Jeremy Benoist
9624b3adfa
These files aren’t used anymore
...
Translation were moved to the global one
2016-11-22 21:23:58 +01:00
Jeremy Benoist
7c6b7a40d1
Merge pull request #2637 from wallabag/mruminski-patch-1
...
Update messages.pl.yml
2016-11-22 20:02:00 +01:00
Mateusz Rumiński
24d4b243a7
Update messages.pl.yml
...
translate shortcuts section to polish
2016-11-22 19:24:38 +01:00
Jeremy Benoist
176e0ea3ca
Merge pull request #2317 from wallabag/restricted-access
...
Added authentication for restricted access articles
2016-11-22 19:12:53 +01:00
Nicolas Lœuillet
d51093a7d9
Added documentation and missing translations
2016-11-22 17:32:24 +01:00
Nicolas Lœuillet
d64bf7953b
Added internal setting to enable/disable articles with paywall
2016-11-22 14:56:53 +01:00
Nicolas Lœuillet
40f3ea57fb
Cleared CookieJar to avoid websites who use cookies for analytics
2016-11-22 14:25:51 +01:00
Thomas Citharel
1d5dd2c241
Merge pull request #2612 from wallabag/add-shortcuts-help
...
Added help about shortcuts
2016-11-22 14:10:12 +01:00
Bertrand Dunogier
7aab0ecf2f
Added authentication for restricted access articles
...
Fix #438 . Thank you so much @bdunogier
2016-11-22 14:01:46 +01:00
Nicolas Lœuillet
893ccad31f
Translations for shortcuts help
2016-11-22 13:33:06 +01:00
Nicolas Lœuillet
c526f9e474
Added help about shortcuts
2016-11-22 13:07:42 +01:00
Jeremy Benoist
bb28368f69
Merge pull request #2635 from wallabag/304-reload
...
Return 304 when content isn't reloaded using the API
2016-11-22 11:27:55 +01:00
Jeremy Benoist
5cd0857e3c
Return 304 when content isn't reloaded using the API
...
Previously it was a 400 but this is more related to a real error.
Using the API user should only know the content got reloaded or not.
If reloaded: 200 otherwise: 304.
2016-11-22 10:45:19 +01:00
Thomas Citharel
944b8d6175
Merge pull request #2613 from wallabag/fix-overlap
...
Fix card action overlap
2016-11-22 10:27:14 +01:00
Nicolas Lœuillet
ba838dae5a
Merge pull request #2614 from wallabag/api-reload
...
Add ability to reload entry from API
2016-11-22 09:39:43 +01:00
Nicolas Lœuillet
c72c6f43f2
Merge pull request #2632 from wallabag/mruminski-patch-1
...
Update messages.pl.yml
2016-11-21 20:17:33 +01:00
Mateusz Rumiński
4bf5172585
Update messages.pl.yml
...
missing polish translation added
2016-11-21 18:18:52 +01:00
Jeremy Benoist
1f00547836
Merge pull request #2630 from ThibaudDauce/fix-black-headings
...
Add white-text class to card-title too
2016-11-21 17:06:55 +01:00
Thibaud Dauce
4f2755a61d
Add white-text class to card-title too
2016-11-21 15:37:47 +01:00
Jeremy Benoist
eb2d613c3e
Merge remote-tracking branch 'origin/master' into 2.2
2016-11-21 15:15:30 +01:00
Jeremy Benoist
625bb56181
Merge pull request #2624 from Rurik19/master
...
Fix #2056 update config.yml
2016-11-21 13:14:31 +01:00
Nicolas Lœuillet
83fed2648b
Merge pull request #2625 from wallabag/prepare-215
...
Prepare wallabag 2.1.5
2016-11-21 09:49:34 +01:00
Nicolas Lœuillet
98253436e9
Prepare wallabag 2.1.5 🚀
2016-11-21 09:20:27 +01:00
Jeremy Benoist
e839f87a1c
Merge pull request #2623 from wallabag/composer-php-5.5
...
Force composer to run as PHP 5.5.9
2016-11-21 09:01:35 +01:00
Jeremy Benoist
f32ff37534
Lock down PHPUnit for PHP 5.5
...
Since Composer defined lowest version is now PHP 5.5.9.
PHPUnit 5.0 require PHP 5.6.
2016-11-21 07:46:46 +01:00
Yuriy Evdokimov
05cdd393d8
wrong spaces
2016-11-21 11:29:09 +05:00
Yuriy Evdokimov
5e7fdfc8dd
Fix #2056 update config.yml
...
Resolves refresh token lifetime issue
2016-11-21 11:13:40 +05:00
Jeremy Benoist
c396a50509
Force composer to run as PHP 5.5.9
2016-11-20 23:07:38 +01:00
Jeremy Benoist
a38d50e1e8
Merge pull request #2621 from wallabag/redis-password
...
Add ability to use Redis with password
2016-11-20 22:27:05 +01:00
Julian Oster
59c42a4aad
Add german translation
2016-11-20 20:43:05 +01:00
Jeremy Benoist
c1683778ab
Add ability to use Redis with password
2016-11-20 20:43:04 +01:00
Jeremy Benoist
56da73969a
Return an explicit error if reload fail
2016-11-20 16:25:13 +01:00
Jeremy Benoist
70584b42aa
Fixing tests
2016-11-20 15:15:13 +01:00
Jeremy Benoist
0a6f4568b5
Add ability to reload entry from API
2016-11-20 13:08:41 +01:00
Jeremy Benoist
5ae8788583
Merge pull request #2609 from wallabag/rss-paging
...
RSS paging
2016-11-20 10:17:37 +01:00
Jeremy Benoist
77e2898ad4
Fix card action overlap
...
On smaller resolution
2016-11-20 10:14:19 +01:00
Jeremy Benoist
16eb124e4a
Add documentation about RSS paging
2016-11-20 09:50:52 +01:00
Jeremy Benoist
edd2472faa
Fix tests
2016-11-20 09:39:26 +01:00
Jeremy Benoist
8670250a26
Add RSS pagination
...
Following https://tools.ietf.org/html/rfc5005#page-4
2016-11-20 09:39:26 +01:00
Jeremy Benoist
3c969d3990
Add missing translations
2016-11-20 09:39:25 +01:00
Nicolas Lœuillet
6f85bed294
Merge pull request #2543 from wallabag/search-engine
...
Added a simple search engine
2016-11-19 20:42:27 +01:00
Nicolas Lœuillet
995c204428
Added shortcut
2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
32f455c131
Added tests
2016-11-19 20:05:16 +01:00
Nicolas Lœuillet
49b042dfdf
Added translations and currentRoute parameter
2016-11-19 19:17:30 +01:00
Nicolas Lœuillet
398de40517
Added search engine in baggy theme
2016-11-19 19:17:30 +01:00
Nicolas Lœuillet
ee122a7528
Added a simple search engine
...
Fix #18
2016-11-19 19:17:30 +01:00
Jeremy Benoist
27dce581ca
Messed up DE import translation
2016-11-19 15:39:02 +01:00
Jeremy Benoist
68003139e1
Merge remote-tracking branch 'origin/master' into 2.2
...
# Conflicts:
# .editorconfig
# docs/de/index.rst
# docs/de/user/import.rst
# docs/en/index.rst
# docs/en/user/configuration.rst
# docs/en/user/import.rst
# docs/fr/index.rst
# docs/fr/user/import.rst
# src/Wallabag/CoreBundle/Command/InstallCommand.php
# src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
# src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
# src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
# web/bundles/wallabagcore/themes/baggy/css/style.min.css
# web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
# web/bundles/wallabagcore/themes/material/css/style.min.css
# web/bundles/wallabagcore/themes/material/js/material.min.js
2016-11-19 15:30:49 +01:00
Jeremy Benoist
cb1a6590c0
Merge pull request #2608 from wallabag/change-dev-version
...
Change version to 2.2.0-dev
2016-11-19 14:56:47 +01:00
