aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* 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
| | * | Remove the left margin of tagJeremy Benoist2016-11-081-0/+4
| * | | Merge pull request #2571 from wallabag/change-language-without-logoutNicolas Lœuillet2016-11-1113-12/+14
| |\ \ \ | | |_|/ | |/| |
| | * | Changed behavior when we change languageNicolas Lœuillet2016-11-1013-12/+14
| |/ /
| * | Merge pull request #2565 from wallabag/remove-support-websiteNicolas Lœuillet2016-11-0912-12/+12
| |\ \
| | * | Removed support website on about pageNicolas Lœuillet2016-11-0912-12/+12
| |/ /
| * | Merge pull request #2563 from wallabag/pr-templateNicolas Lœuillet2016-11-091-8/+13
| |\ \ | | |/ | |/|
| | * Improve PR templateJeremy Benoist2016-11-081-8/+13
| |/
| * Merge pull request #2561 from wallabag/Rurik19-patch-2259Thomas Citharel2016-11-081-1/+1
| |\
| | * fix #2559Yuriy Evdokimov2016-11-081-1/+1
| |/
| * Merge pull request #2555 from dkrmr/fix_update_scriptNicolas Lœuillet2016-11-071-1/+1
| |\
| | * Reorder variable assignation in update.sh script, fix #2554Darius Kramer2016-11-071-1/+1
| * | Merge pull request #2556 from wallabag/replace-tokenstorageNicolas Lœuillet2016-11-072-10/+21
| |\ \ | | |/ | |/|
| | * PHP CSNicolas Lœuillet2016-11-071-3/+2
| | * Replaced TokenStorage with TokenStorageInterfaceNicolas Lœuillet2016-11-072-7/+19
| * | Merge pull request #2552 from wallabag/reading-time-roundJeremy Benoist2016-11-061-1/+1
| |\ \ | | |/ | |/|