aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'wallabag/master'Paulino Michelazzo2016-10-18459-20211/+144794
|\
| * Merge pull request #2467 from wallabag/version-213devJeremy Benoist2016-10-171-1/+1
| |\
| | * Update wallabag version for master branchNicolas Lœuillet2016-10-171-1/+1
| |/
| * Merge pull request #2466 from wallabag/fix-update-docNicolas Lœuillet2016-10-173-3/+3
| |\
| | * Removed MD5 hash in documentationNicolas Lœuillet2016-10-173-3/+3
| |/
| * Merge pull request #2452 from wallabag/prepare-212Nicolas Lœuillet2016-10-173-1336/+78
| |\
| | * Change release title in changelogNicolas Lœuillet2016-10-171-1/+1
| | * Update release processNicolas Lœuillet2016-10-171-1/+1
| | * Update changelogNicolas Lœuillet2016-10-171-1356/+50
| | * Prepare wallabag 2.1.2 :rocket:Nicolas Lœuillet2016-10-172-3/+51
| |/
| * Merge pull request #2464 from wallabag/fix-settings-translationNicolas Lœuillet2016-10-171-1/+1
| |\
| | * Fixed hardcoded title for internal settingsNicolas Lœuillet2016-10-171-1/+1
| |/
| * Merge pull request #2455 from wallabag/fix-material-config-tabsJeremy Benoist2016-10-163-11/+11
| |\
| | * Fix tabs on materialThomas Citharel2016-10-153-11/+11
| * | Merge pull request #2454 from wallabag/fix-baggy-small-widthJeremy Benoist2016-10-1611-42/+28
| |\ \
| | * | Fix baggy on small screensThomas Citharel2016-10-1511-42/+28
| | |/
| * | Merge pull request #2459 from wallabag/improve-german-translationThomas Citharel2016-10-163-53/+53
| |\ \
| | * | German: improve existing and add missing translationSven Fischer2016-10-163-53/+53
| | |/
| * | Merge pull request #2457 from wallabag/link-german-docuThomas Citharel2016-10-161-0/+1
| |\ \ | | |/ | |/|
| | * add link to German documentation in about pageSven Fischer2016-10-161-0/+1
| |/
| * Merge pull request #2451 from wallabag/add-dev-makeThomas Citharel2016-10-152-0/+10
| |\
| | * Bring make devThomas Citharel2016-10-152-0/+10
| * | Merge pull request #2450 from wallabag/new-improvement-viewThomas Citharel2016-10-158-45/+65
| |\ \ | | |/ | |/|
| | * fix stylelintThomas Citharel2016-10-159-43/+43
| | * Improved side menu, reduced the font size on small screens, fixed a form to a...Alexandr Danilov2016-10-1510-35/+55
| * | Merge pull request #2412 from wallabag/fix-postgres-migrationThomas Citharel2016-10-154-14/+24
| |\ \ | | |/ | |/|
| | * Fix PostgreSQL migrationsJeremy Benoist2016-10-094-14/+24
| * | Merge pull request #2446 from wallabag/fix-taggingrules-docNicolas Lœuillet2016-10-153-3/+3
| |\ \
| | * | docs/de/user/configuration.rst: German fix for tagging rules docuSven Fischer2016-10-141-1/+1
| | * | docs/de/user/configuration.rst: German fix for tagging rules docuSven Fischer2016-10-141-1/+1
| | * | Added information about tagging rules in documentationNicolas Lœuillet2016-10-143-3/+3
| * | | Merge pull request #2447 from wallabag/fix-fr-de-doc-homepageNicolas Lœuillet2016-10-142-4/+4
| |\ \ \
| | * | | Fixed french and german doc homepagesNicolas Lœuillet2016-10-142-4/+4
| |/ / /
| * | | Merge pull request #2444 from Kaligule/masterNicolas Lœuillet2016-10-141-1/+1
| |\ \ \
| | * | | Merge pull request #1 from Kaligule/DocumentationKaligule2016-10-141-1/+1
| |/| | |
| | * | | Mention example instanceKaligule2016-10-141-1/+1
| |/ / /
| * | | Merge pull request #2435 from wallabag/french-upgrade-docNicolas Lœuillet2016-10-136-41/+81
| |\ \ \
| | * | | Added missing spaceNicolas Lœuillet2016-10-131-1/+1
| | * | | update German user/upgrade-2.1.x-2.1.y.rstSven Fischer2016-10-121-5/+5
| | * | | update German user/upgrade-2.0.x-2.1.1Sven Fischer2016-10-121-14/+34
| | * | | Added french documentation for upgradeNicolas Lœuillet2016-10-125-22/+42
| | |/ /
| * | | Merge pull request #2434 from wallabag/parameters-docNicolas Lœuillet2016-10-136-3/+106
| |\ \ \
| | * | | translate to German: user/parametersSven Fischer2016-10-122-0/+51
| | * | | Added french documentation for parameters.ymlNicolas Lœuillet2016-10-124-3/+55
| | |/ /
| * | | Merge pull request #2439 from zertrin/minor-fix-docs-1Nicolas Lœuillet2016-10-133-7/+8
| |\ \ \ | | |/ / | |/| |
| | * | Minor fixes in the english documentationzertrin2016-10-133-7/+8
| |/ /
| * | Merge pull request #2432 from wallabag/issue-site-configNicolas Lœuillet2016-10-121-0/+2
| |\ \
| | * | Update ISSUE_TEMPLATE.mdJeremy Benoist2016-10-121-0/+2
| |/ /
| * | Merge pull request #2429 from wallabag/lock-fos-userNicolas Lœuillet2016-10-112-5/+3
| |\ \
| | * | Lock deps for FOSUserJeremy Benoist2016-10-112-5/+3
| |/ /