aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Update changelogNicolas Lœuillet2016-05-071-0/+26
* Prepare wallabag 2.0.4Nicolas Lœuillet2016-05-074-4/+4
* Merge pull request #2016 from wallabag/update-documentationJeremy Benoist2016-05-0721-181/+307
|\
| * Change documentation about Pocket importNicolas Lœuillet2016-05-052-2/+2
| * Add documentation to know how to contribute to the documentation :trollface:Nicolas Lœuillet2016-05-044-0/+26
| * Fix lighttpd documentationNicolas Lœuillet2016-05-042-22/+20
| * Add Third resources for wallabag APINicolas Lœuillet2016-05-042-2/+6
| * Move some parts in FAQNicolas Lœuillet2016-05-0312-146/+60
| * Add LigHTTPd documentationNicolas Lœuillet2016-05-032-4/+82
| * Update documentationNicolas Lœuillet2016-05-037-32/+138
* | Merge pull request #2020 from wallabag/fix-number-entries-per-tagJeremy Benoist2016-05-073-2/+14
|\ \
| * | Rename getEntriesByUser method to getEntriesByUserIdNicolas Lœuillet2016-05-043-3/+3
| * | Fix number of entries in tag/listNicolas Lœuillet2016-05-033-2/+14
* | | Merge pull request #2024 from wallabag/jamiroconca-patch-messages-itJeremy Benoist2016-05-071-192/+192
|\ \ \
| * | | Update messages.it.ymlDaniele Conca2016-05-051-62/+62
| * | | Update messages.it.ymlDaniele Conca2016-05-041-131/+131
* | | | Merge pull request #2029 from wallabag/change-readmeJeremy Benoist2016-05-051-2/+2
|\ \ \ \
| * | | | Change Travis/Scrutinizer pictures in READMENicolas Lœuillet2016-05-051-2/+2
|/ / / /
* | | | Merge pull request #2028 from wallabag/docu-for-android-appNicolas Lœuillet2016-05-0512-0/+108
|\ \ \ \ | |/ / / |/| | |
| * | | android docu: Wallabag > wallabag (no uppercase)Sven Fischer2016-05-051-8/+8
| * | | add first draft of Android app documentationSven Fischer2016-05-0412-0/+108
|/ / /
* | | Merge pull request #2022 from wallabag/fix-pagination-barNicolas Lœuillet2016-05-045-21/+28
|\ \ \ | |/ / |/| |
| * | Add pagination bar at the bottom of the pageNicolas Lœuillet2016-05-034-21/+25
| * | Fix pagination bar on small devicesNicolas Lœuillet2016-05-031-0/+3
|/ /
* | Merge pull request #2017 from jamiroconca/patch-1Nicolas Lœuillet2016-05-031-0/+425
|\ \
| * | Create messages.it.ymlDaniele Conca2016-05-031-0/+425
| |/
* | Merge pull request #2018 from jamiroconca/patch-2Nicolas Lœuillet2016-05-031-0/+1
|\ \
| * | Update config.ymlDaniele Conca2016-05-031-0/+1
| |/
* | Merge pull request #2019 from jamiroconca/patch-3Nicolas Lœuillet2016-05-031-0/+29
|\ \ | |/ |/|
| * Create CraueConfigBundle.it.ymlDaniele Conca2016-05-031-0/+29
|/
* Merge pull request #2013 from wallabag/fix-display-all-tagsJeremy Benoist2016-05-034-36/+6
|\
| * Remove useless methodNicolas Lœuillet2016-05-031-15/+3
| * Fix tags listingNicolas Lœuillet2016-05-024-21/+3
* | Merge pull request #1976 from wallabag/fix-filter-readingTimeJeremy Benoist2016-05-033-2/+53
|\ \
| * | Add test to check reading time filterNicolas Lœuillet2016-05-021-0/+37
| * | Fix testsNicolas Lœuillet2016-04-242-2/+6
| * | Fix wrong reading time when apply filtersNicolas Lœuillet2016-04-241-0/+10
* | | Merge pull request #2005 from wallabag/fix-readingspeed-not-definedJeremy Benoist2016-05-032-0/+6
|\ \ \ | |_|/ |/| |
| * | Add test for creation of new user in config pageNicolas Lœuillet2016-05-021-0/+5
| * | Fix reading speed not defined when user was created via config pageNicolas Lœuillet2016-04-301-0/+1
* | | Merge pull request #2012 from biva/patch-2Nicolas Lœuillet2016-05-021-0/+1
|\ \ \
| * | | integrate upgrade.rstbiva2016-05-021-0/+1
* | | | Merge pull request #2011 from biva/patch-1Nicolas Lœuillet2016-05-021-0/+24
|\ \ \ \ | |/ / / |/| | |
| * | | upgrade.rstbiva2016-05-021-0/+24
|/ / /
* | | Merge pull request #2010 from wallabag/set-title-via-post-apiJeremy Benoist2016-05-022-0/+7
|\ \ \ | |/ / |/| |
| * | Set the title via POST /api/entriesNicolas Lœuillet2016-05-022-0/+7
|/ /
* | Merge pull request #2001 from wallabag/fix-old-branch-name-urlsNicolas Lœuillet2016-04-302-2/+2
|\ \
| * | same with frThomas Citharel2016-04-301-1/+1
| * | doc url still in v2 formThomas Citharel2016-04-301-1/+1
|/ /
* | Merge pull request #1992 from jami7/patch-10Jeremy Benoist2016-04-281-3/+3
|\ \