Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add unread filter test to EntryControllerTest | Daniel Bartram | 2016-05-09 | 1 | -0/+18 |
| | | | | | | Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. | ||||
* | Add unread filter to entries pages | Daniel Bartram | 2016-05-09 | 13 | -0/+32 |
| | | | | Add the ability to filter for unread pages in the filters menu. | ||||
* | Merge pull request #2044 from joshp23/patch-1 | Nicolas Lœuillet | 2016-05-09 | 1 | -1/+2 |
|\ | | | | | Update api.rst | ||||
| * | Update api.rst | Josh Panter | 2016-05-08 | 1 | -1/+2 |
|/ | | | Added my plugin, renamed the resource section for better english. Propose that the third party resource section have it's own page. | ||||
* | Merge pull request #2038 from foxmask/master | Nicolas Lœuillet | 2016-05-08 | 2 | -0/+45 |
|\ | | | | | new details in the doc about the rights access again;) | ||||
| * | new details in the doc about the rgihts access again;) | Olivier Demah | 2016-05-07 | 2 | -0/+45 |
|/ | |||||
* | Merge pull request #2035 from wallabag/prepare-204 | Nicolas Lœuillet | 2016-05-07 | 5 | -4/+30 |
|\ | | | | | Prepare wallabag 2.0.4 | ||||
| * | Update changelog | Nicolas Lœuillet | 2016-05-07 | 1 | -0/+26 |
| | | |||||
| * | Prepare wallabag 2.0.4 | Nicolas Lœuillet | 2016-05-07 | 4 | -4/+4 |
| | | |||||
* | | Merge pull request #2023 from wallabag/fix-validators-translation | Jeremy Benoist | 2016-05-07 | 24 | -79/+68 |
|\ \ | |/ |/| | Fix translation for validators | ||||
| * | Fix translation for validators | Nicolas Lœuillet | 2016-05-07 | 24 | -79/+68 |
|/ | | | | Fix #2003 | ||||
* | Merge pull request #2016 from wallabag/update-documentation | Jeremy Benoist | 2016-05-07 | 21 | -181/+307 |
|\ | | | | | Update documentation | ||||
| * | Change documentation about Pocket import | Nicolas Lœuillet | 2016-05-05 | 2 | -2/+2 |
| | | | | | | | | Fix wallabag/docker#8 | ||||
| * | Add documentation to know how to contribute to the documentation :trollface: | Nicolas Lœuillet | 2016-05-04 | 4 | -0/+26 |
| | | |||||
| * | Fix lighttpd documentation | Nicolas Lœuillet | 2016-05-04 | 2 | -22/+20 |
| | | |||||
| * | Add Third resources for wallabag API | Nicolas Lœuillet | 2016-05-04 | 2 | -2/+6 |
| | | |||||
| * | Move some parts in FAQ | Nicolas Lœuillet | 2016-05-03 | 12 | -146/+60 |
| | | |||||
| * | Add LigHTTPd documentation | Nicolas Lœuillet | 2016-05-03 | 2 | -4/+82 |
| | | | | | | | | Fix #1931 | ||||
| * | Update documentation | Nicolas Lœuillet | 2016-05-03 | 7 | -32/+138 |
| | | |||||
* | | Merge pull request #2020 from wallabag/fix-number-entries-per-tag | Jeremy Benoist | 2016-05-07 | 3 | -2/+14 |
|\ \ | | | | | | | Fix number of entries in tag/list | ||||
| * | | Rename getEntriesByUser method to getEntriesByUserId | Nicolas Lœuillet | 2016-05-04 | 3 | -3/+3 |
| | | | |||||
| * | | Fix number of entries in tag/list | Nicolas Lœuillet | 2016-05-03 | 3 | -2/+14 |
| | | | | | | | | | | | | Fix #2006 | ||||
* | | | Merge pull request #2024 from wallabag/jamiroconca-patch-messages-it | Jeremy Benoist | 2016-05-07 | 1 | -192/+192 |
|\ \ \ | | | | | | | | | Update messages.it.yml | ||||
| * | | | Update messages.it.yml | Daniele Conca | 2016-05-05 | 1 | -62/+62 |
| | | | | | | | | | | | | other translations added | ||||
| * | | | Update messages.it.yml | Daniele Conca | 2016-05-04 | 1 | -131/+131 |
| | | | | |||||
* | | | | Merge pull request #2029 from wallabag/change-readme | Jeremy Benoist | 2016-05-05 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Change Travis/Scrutinizer pictures in README | ||||
| * | | | | Change Travis/Scrutinizer pictures in README | Nicolas Lœuillet | 2016-05-05 | 1 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #2028 from wallabag/docu-for-android-app | Nicolas Lœuillet | 2016-05-05 | 12 | -0/+108 |
|\ \ \ \ | |/ / / |/| | | | Docu for android app | ||||
| * | | | android docu: Wallabag > wallabag (no uppercase) | Sven Fischer | 2016-05-05 | 1 | -8/+8 |
| | | | | |||||
| * | | | add first draft of Android app documentation | Sven Fischer | 2016-05-04 | 12 | -0/+108 |
|/ / / | |||||
* | | | Merge pull request #2022 from wallabag/fix-pagination-bar | Nicolas Lœuillet | 2016-05-04 | 5 | -21/+28 |
|\ \ \ | |/ / |/| | | Fix pagination bar on small devices | ||||
| * | | Add pagination bar at the bottom of the page | Nicolas Lœuillet | 2016-05-03 | 4 | -21/+25 |
| | | | | | | | | | | | | Fix #2021 | ||||
| * | | Fix pagination bar on small devices | Nicolas Lœuillet | 2016-05-03 | 1 | -0/+3 |
|/ / | | | | | | | Fix #2008 | ||||
* | | Merge pull request #2017 from jamiroconca/patch-1 | Nicolas Lœuillet | 2016-05-03 | 1 | -0/+425 |
|\ \ | | | | | | | Create messages.it.yml | ||||
| * | | Create messages.it.yml | Daniele Conca | 2016-05-03 | 1 | -0/+425 |
| |/ | | | | | baseline for italian translations (cloned from english) | ||||
* | | Merge pull request #2018 from jamiroconca/patch-2 | Nicolas Lœuillet | 2016-05-03 | 1 | -0/+1 |
|\ \ | | | | | | | Update config.yml, add italian as available language | ||||
| * | | Update config.yml | Daniele Conca | 2016-05-03 | 1 | -0/+1 |
| |/ | | | | | add italian as available language | ||||
* | | Merge pull request #2019 from jamiroconca/patch-3 | Nicolas Lœuillet | 2016-05-03 | 1 | -0/+29 |
|\ \ | |/ |/| | Create CraueConfigBundle.it.yml | ||||
| * | Create CraueConfigBundle.it.yml | Daniele Conca | 2016-05-03 | 1 | -0/+29 |
|/ | | | baseline italian translations | ||||
* | Merge pull request #2013 from wallabag/fix-display-all-tags | Jeremy Benoist | 2016-05-03 | 4 | -36/+6 |
|\ | | | | | Fix tags listing | ||||
| * | Remove useless method | Nicolas Lœuillet | 2016-05-03 | 1 | -15/+3 |
| | | |||||
| * | Fix tags listing | Nicolas Lœuillet | 2016-05-02 | 4 | -21/+3 |
| | | | | | | | | | | Fix #1994 * Remove unused method in tag repository | ||||
* | | Merge pull request #1976 from wallabag/fix-filter-readingTime | Jeremy Benoist | 2016-05-03 | 3 | -2/+53 |
|\ \ | | | | | | | Fix filter reading time | ||||
| * | | Add test to check reading time filter | Nicolas Lœuillet | 2016-05-02 | 1 | -0/+37 |
| | | | |||||
| * | | Fix tests | Nicolas Lœuillet | 2016-04-24 | 2 | -2/+6 |
| | | | |||||
| * | | Fix wrong reading time when apply filters | Nicolas Lœuillet | 2016-04-24 | 1 | -0/+10 |
| | | | |||||
* | | | Merge pull request #2005 from wallabag/fix-readingspeed-not-defined | Jeremy Benoist | 2016-05-03 | 2 | -0/+6 |
|\ \ \ | |_|/ |/| | | Fix reading speed not defined when user was created via config page | ||||
| * | | Add test for creation of new user in config page | Nicolas Lœuillet | 2016-05-02 | 1 | -0/+5 |
| | | | |||||
| * | | Fix reading speed not defined when user was created via config page | Nicolas Lœuillet | 2016-04-30 | 1 | -0/+1 |
| | | | | | | | | | | | | Fix #2004 | ||||
* | | | Merge pull request #2012 from biva/patch-2 | Nicolas Lœuillet | 2016-05-02 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | integrate upgrade.rst |