Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | | integrate upgrade.rst | biva | 2016-05-02 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #2011 from biva/patch-1 | Nicolas Lœuillet | 2016-05-02 | 1 | -0/+24 |
|\ \ \ \ | |/ / / |/| | | | upgrade.rst (Creation of an upgrade page in the documentation) | ||||
| * | | | upgrade.rst | biva | 2016-05-02 | 1 | -0/+24 |
|/ / / | | | | | | | Creation of an upgrade page in the documentation | ||||
* | | | Merge pull request #2010 from wallabag/set-title-via-post-api | Jeremy Benoist | 2016-05-02 | 2 | -0/+7 |
|\ \ \ | |/ / |/| | | Set the title via POST /api/entries | ||||
| * | | Set the title via POST /api/entries | Nicolas Lœuillet | 2016-05-02 | 2 | -0/+7 |
|/ / | | | | | | | Fix #2009 | ||||
* | | Merge pull request #2001 from wallabag/fix-old-branch-name-urls | Nicolas Lœuillet | 2016-04-30 | 2 | -2/+2 |
|\ \ | | | | | | | Fix old branch name urls | ||||
| * | | same with fr | Thomas Citharel | 2016-04-30 | 1 | -1/+1 |
| | | | |||||
| * | | doc url still in v2 form | Thomas Citharel | 2016-04-30 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #1992 from jami7/patch-10 | Jeremy Benoist | 2016-04-28 | 1 | -3/+3 |
|\ \ | | | | | | | Update CraueConfigBundle.es.yml | ||||
| * | | Update CraueConfigBundle.es.yml | jami7 | 2016-04-27 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #1985 from foxmask/master | Nicolas Lœuillet | 2016-04-27 | 2 | -0/+55 |
|\ \ | | | | | | | Rights access to the folders of the project | ||||
| * | | fixed typo | Olivier Demah | 2016-04-26 | 2 | -7/+5 |
| | | | |||||
| * | | Rights access to the folder of the project | Olivier Demah | 2016-04-26 | 2 | -0/+57 |
|/ / | |||||
* | | Merge pull request #1977 from wallabag/es-translation | Nicolas Lœuillet | 2016-04-25 | 1 | -98/+98 |
|\ \ | |/ |/| | Es translation | ||||
| * | Fix indentations in ES translation | Jeremy Benoist | 2016-04-24 | 1 | -39/+39 |
| | | |||||
| * | Update messages.es.yml | jami7 | 2016-04-24 | 1 | -1/+1 |
| | | |||||
| * | Update messages.es.yml | jami7 | 2016-04-24 | 1 | -98/+98 |
|/ | |||||
* | Merge pull request #1970 from wallabag/typo-api-doc | Thomas Citharel | 2016-04-23 | 2 | -6/+2 |
|\ | | | | | Fix typos in API documentation | ||||
| * | Fix typos in API documentation | Nicolas Lœuillet | 2016-04-23 | 2 | -6/+2 |
|/ |