Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #2663 from wallabag/remove-fosuser-attributes | Nicolas Lœuillet | 2016-11-28 | 15 | -27/+1 | |
|\ \ | | | | | | | Removed FOSUser attributes removed in alpha4 | |||||
| * | | Removed FOSUser attributes removed in alpha4 | Nicolas Lœuillet | 2016-11-28 | 15 | -27/+1 | |
| | | | | | | | | | | | | See https://github.com/FriendsOfSymfony/FOSUserBundle/blob/master/Upgrade.md\#200-alpha3-to-200-alpha4 | |||||
* | | | Merge pull request #2659 from ↵ | Nicolas Lœuillet | 2016-11-28 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | | | | | | | akovalyov/bugfix/non-latin-characters-in-reading-time-calculation Fix incorrect reading time calculation for entries in non-latin languages. | |||||
| * | | Fix incorrect reading time calculation for entries in languages with | Andrew Kovalyov | 2016-11-28 | 1 | -1/+1 | |
| |/ | | | | | | | non-latin chars subset. | |||||
* | | Enforce lowercase on domain name filter | Kevin Decherf | 2016-11-26 | 1 | -1/+1 | |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | |||||
* | | Merge pull request #2620 from wallabag/fix-password-layout | Jeremy Benoist | 2016-11-23 | 2 | -2/+2 | |
|\ \ | | | | | | | Fix password layout | |||||
| * | | Re-use FOSUser master branch | Jeremy Benoist | 2016-11-22 | 1 | -1/+1 | |
| | | | ||||||
| * | | Use the correct template | Jeremy Benoist | 2016-11-22 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | 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. | |||||
* | | | Fixed entry shortcuts available in list view | Nicolas Lœuillet | 2016-11-22 | 1 | -1/+1 | |
|/ / | ||||||
* | | Merge pull request #2637 from wallabag/mruminski-patch-1 | Jeremy Benoist | 2016-11-22 | 1 | -28/+28 | |
|\ \ | | | | | | | Update messages.pl.yml | |||||
| * | | Update messages.pl.yml | Mateusz Rumiński | 2016-11-22 | 1 | -28/+28 | |
| | | | | | | | | | translate shortcuts section to polish | |||||
* | | | Merge pull request #2317 from wallabag/restricted-access | Jeremy Benoist | 2016-11-22 | 5 | -0/+165 | |
|\ \ \ | |/ / |/| | | Added authentication for restricted access articles | |||||
| * | | Added documentation and missing translations | Nicolas Lœuillet | 2016-11-22 | 1 | -1/+1 | |
| | | | ||||||
| * | | Added internal setting to enable/disable articles with paywall | Nicolas Lœuillet | 2016-11-22 | 4 | -2/+21 | |
| | | | ||||||
| * | | Cleared CookieJar to avoid websites who use cookies for analytics | Nicolas Lœuillet | 2016-11-22 | 1 | -0/+2 | |
| | | | ||||||
| * | | Added authentication for restricted access articles | Bertrand Dunogier | 2016-11-22 | 3 | -0/+144 | |
| | | | | | | | | | | | | Fix #438. Thank you so much @bdunogier | |||||
* | | | Translations for shortcuts help | Nicolas Lœuillet | 2016-11-22 | 12 | -0/+360 | |
| | | | ||||||
* | | | Added help about shortcuts | Nicolas Lœuillet | 2016-11-22 | 1 | -24/+171 | |
|/ / | ||||||
* | | Return 304 when content isn't reloaded using the API | Jeremy Benoist | 2016-11-22 | 1 | -3/+3 | |
| | | | | | | | | | | | | 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. | |||||
* | | Merge pull request #2614 from wallabag/api-reload | Nicolas Lœuillet | 2016-11-22 | 1 | -0/+45 | |
|\ \ | | | | | | | Add ability to reload entry from API | |||||
| * | | Return an explicit error if reload fail | Jeremy Benoist | 2016-11-20 | 1 | -6/+3 | |
| | | | ||||||
| * | | Fixing tests | Jeremy Benoist | 2016-11-20 | 1 | -1/+1 | |
| | | | ||||||
| * | | Add ability to reload entry from API | Jeremy Benoist | 2016-11-20 | 1 | -0/+48 | |
| | | | ||||||
* | | | Update messages.pl.yml | Mateusz Rumiński | 2016-11-21 | 1 | -11/+11 | |
| | | | | | | | | | missing polish translation added | |||||
* | | | Merge pull request #2630 from ThibaudDauce/fix-black-headings | Jeremy Benoist | 2016-11-21 | 1 | -6/+6 | |
|\ \ \ | | | | | | | | | Add white-text class to card-title too | |||||
| * | | | Add white-text class to card-title too | Thibaud Dauce | 2016-11-21 | 1 | -6/+6 | |
| | |/ | |/| | ||||||
* | | | Add ability to use Redis with password | Jeremy Benoist | 2016-11-20 | 1 | -0/+1 | |
| |/ |/| | ||||||
* | | Add RSS pagination | Jeremy Benoist | 2016-11-20 | 2 | -8/+38 | |
| | | | | | | | | Following https://tools.ietf.org/html/rfc5005#page-4 | |||||
* | | Added tests | Nicolas Lœuillet | 2016-11-19 | 4 | -4/+5 | |
| | | ||||||
* | | Added translations and currentRoute parameter | Nicolas Lœuillet | 2016-11-19 | 15 | -8/+57 | |
| | | ||||||
* | | Added search engine in baggy theme | Nicolas Lœuillet | 2016-11-19 | 5 | -15/+26 | |
| | | ||||||
* | | Added a simple search engine | Nicolas Lœuillet | 2016-11-19 | 9 | -16/+113 | |
| | | | | | | | | Fix #18 | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-19 | 45 | -208/+447 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 | |||||
| * | Wallabag can’t work on PostgreSQL <= 9.1 | Jeremy Benoist | 2016-11-19 | 1 | -1/+22 | |
| | | ||||||
| * | Added tooltips for baggy theme | Nicolas Lœuillet | 2016-11-17 | 1 | -0/+18 | |
| | | ||||||
| * | Added help on config screen | Nicolas Lœuillet | 2016-11-17 | 27 | -19/+143 | |
| | | ||||||
| * | Merge pull request #2570 from wallabag/add-creation-date | Jeremy Benoist | 2016-11-15 | 4 | -3/+13 | |
| |\ | | | | | | | Added creation date on entries view | |||||
| | * | Hide creation date in mobile view | Nicolas Lœuillet | 2016-11-14 | 1 | -2/+2 | |
| | | | ||||||
| | * | Changed display for material theme | Nicolas Lœuillet | 2016-11-14 | 2 | -2/+4 | |
| | | | ||||||
| | * | Added creation date on entries view | Nicolas Lœuillet | 2016-11-14 | 2 | -1/+9 | |
| | | | ||||||
| * | | User-agents have moved to site-config | Jeremy Benoist | 2016-11-14 | 1 | -15/+0 | |
| |/ | | | | | Since graby@1.5.0, user-agent can be defined in site-config, which the now recommended way | |||||
| * | Merge pull request #2577 from wallabag/add-tooltip-material | Jeremy Benoist | 2016-11-14 | 1 | -3/+3 | |
| |\ | | | | | | | Added tooltips in header bar | |||||
| | * | Added tooltips in header bar | Nicolas Lœuillet | 2016-11-12 | 1 | -3/+3 | |
| | | | ||||||
| * | | Merge pull request #2562 from wallabag/image-bigger | Thomas Citharel | 2016-11-14 | 6 | -68/+130 | |
| |\ \ | | | | | | | | | Bigger image preview in case of only image content | |||||
| | * | | Display a bigger image in case of image content | Jeremy Benoist | 2016-11-08 | 6 | -68/+130 | |
| | | | | | | | | | | | | | | | | | | | | | | | | If the content is only an image, we can display a bigger preview image because we won’t have text to display. Also, split different card view to avoid too much complexity in the entries.html.twig | |||||
| * | | | Changed behavior when we change language | Nicolas Lœuillet | 2016-11-10 | 13 | -12/+14 | |
| | |/ | |/| | | | | | | | No need to disconnect to apply the language substitution | |||||
| * | | Removed support website on about page | Nicolas Lœuillet | 2016-11-09 | 12 | -12/+12 | |
| |/ | ||||||
| * | fix #2559 | Yuriy Evdokimov | 2016-11-08 | 1 | -1/+1 | |
| | | ||||||
| * | Merge pull request #2556 from wallabag/replace-tokenstorage | Nicolas Lœuillet | 2016-11-07 | 2 | -10/+21 | |
| |\ | | | | | | | Replaced TokenStorage with TokenStorageInterface | |||||
| | * | PHP CS | Nicolas Lœuillet | 2016-11-07 | 1 | -3/+2 | |
| | | |