aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2621 from wallabag/redis-passwordJeremy Benoist2016-11-205-0/+8
|\
| * Add german translationJulian Oster2016-11-201-1/+1
| * Add ability to use Redis with passwordJeremy Benoist2016-11-205-0/+8
|/
* Merge pull request #2609 from wallabag/rss-pagingJeremy Benoist2016-11-2018-13/+112
|\
| * Add documentation about RSS pagingJeremy Benoist2016-11-203-0/+9
| * Fix testsJeremy Benoist2016-11-201-9/+5
| * Add RSS paginationJeremy Benoist2016-11-203-12/+91
| * Add missing translationsJeremy Benoist2016-11-2012-1/+16
|/
* Merge pull request #2543 from wallabag/search-engineNicolas Lœuillet2016-11-1934-64/+307
|\
| * Added shortcutNicolas Lœuillet2016-11-197-5/+19
| * Added testsNicolas Lœuillet2016-11-196-5/+73
| * Added translations and currentRoute parameterNicolas Lœuillet2016-11-1915-8/+57
| * Added search engine in baggy themeNicolas Lœuillet2016-11-195-15/+26
| * Added a simple search engineNicolas Lœuillet2016-11-1915-50/+151
|/
* Messed up DE import translationJeremy Benoist2016-11-191-34/+1
* Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-19124-2586/+2827
|\
| * Merge pull request #2608 from wallabag/change-dev-versionJeremy Benoist2016-11-191-1/+1
| |\
| | * Change version to 2.2.0-devNicolas Lœuillet2016-11-191-1/+1
| |/
| * Merge pull request #2607 from wallabag/update-changelogNicolas Lœuillet2016-11-191-1/+5
| |\
| | * Updated changelog for 2.1.4Nicolas Lœuillet2016-11-191-1/+5
| |/
| * Merge pull request #2604 from wallabag/postgresql-versionNicolas Lœuillet2016-11-191-1/+22
| |\
| | * Wallabag can’t work on PostgreSQL <= 9.1Jeremy Benoist2016-11-191-1/+22
| * | Merge pull request #2605 from wallabag/update-release-processNicolas Lœuillet2016-11-191-1/+14
| |\ \
| | * | Add .travis.yml change to RELEASE_PROCESSJeremy Benoist2016-11-191-1/+14
| | |/
| * | Merge pull request #2603 from wallabag/fix-composer-no-devJeremy Benoist2016-11-191-2/+2
| |\ \ | | |/ | |/|
| | * Fix clear-cache problem using —no-devJeremy Benoist2016-11-191-2/+2
| |/
| * Merge pull request #2596 from wallabag/prepare-214Nicolas Lœuillet2016-11-182-1/+20
| |\
| | * Prepare wallabag 2.1.4 :rocket:Nicolas Lœuillet2016-11-182-1/+20
| |/
| * Merge pull request #2550 from wallabag/reorder-documentationNicolas Lœuillet2016-11-1860-1418/+1681
| |\
| | * Undo translation of 'in english'.Julian Oster2016-11-181-1/+1
| | * Reordered documentation for German.Julian Oster2016-11-1719-485/+545
| | * Update translation of link to german translation.Julian Oster2016-11-172-2/+2
| | * Reordered :fr: documentationNicolas Lœuillet2016-11-1727-547/+654
| | * Reordered documentationNicolas Lœuillet2016-11-1718-389/+485
| |/
| * Merge pull request #2578 from wallabag/questionmark-iconNicolas Lœuillet2016-11-1733-34/+170
| |\
| | * Added tooltips for baggy themeNicolas Lœuillet2016-11-171-0/+18
| | * Added help on config screenNicolas Lœuillet2016-11-1733-34/+152
| |/
| * Merge pull request #2570 from wallabag/add-creation-dateJeremy Benoist2016-11-1510-33/+43
| |\
| | * Hide creation date in mobile viewNicolas Lœuillet2016-11-141-2/+2
| | * Changed display for material themeNicolas Lœuillet2016-11-144-5/+6
| | * Added creation date on entries viewNicolas Lœuillet2016-11-148-30/+39
| * | Merge pull request #2587 from wallabag/user-agentsJeremy Benoist2016-11-151-15/+0
| |\ \
| | * | User-agents have moved to site-configJeremy Benoist2016-11-141-15/+0
| |/ /
| * | Merge pull request #2584 from blankoworld/masterJeremy Benoist2016-11-143-0/+18
| |\ \ | | |/ | |/|
| | * fix #2582 - Nginx config: disable all other PHP file from symphonyOlivier DOSSMANN2016-11-143-0/+18
| |/
| * Merge pull request #2577 from wallabag/add-tooltip-materialJeremy Benoist2016-11-141-3/+3
| |\
| | * Added tooltips in header barNicolas Lœuillet2016-11-121-3/+3
| * | Merge pull request #2562 from wallabag/image-biggerThomas Citharel2016-11-1412-99/+176
| |\ \
| | * | Display a bigger image in case of image contentJeremy Benoist2016-11-0810-97/+164
| | * | Add `grunt watch` taskJeremy Benoist2016-11-082-2/+8