aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* first draft (from v1)Thomas Citharel2016-10-291-0/+168
* Merge pull request #2499 from wallabag/add-relation-client-userJeremy Benoist2016-10-296-7/+110
|\
| * Remove backquote in queryNicolas Lœuillet2016-10-281-4/+1
| * Fixed migration and added testsNicolas Lœuillet2016-10-283-4/+18
| * Added relation between API Client and UserNicolas Lœuillet2016-10-244-3/+95
|/
* Merge pull request #2496 from wallabag/mruminski-patch-1Nicolas Lœuillet2016-10-241-10/+10
|\
| * Update messages.pl.ymlMateusz Rumiński2016-10-241-10/+10
|/
* Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-10-2482-1574/+659
|\
| * Merge pull request #2486 from wallabag/translate-backup-docJeremy Benoist2016-10-225-11/+63
| |\
| | * Translate backup.rst to GermanJulian Oster2016-10-221-14/+14
| | * Added :fr: documentation for wallabag backupNicolas Lœuillet2016-10-225-11/+63
| |/
| * Merge pull request #2484 from bmillemathias/fix_2479Nicolas Lœuillet2016-10-222-0/+27
| |\
| | * Document what to backup in WallabagBaptiste Mille-Mathias2016-10-222-0/+27
| * | Merge pull request #2485 from bmillemathias/fix_android_documentationJeremy Benoist2016-10-221-1/+1
| |\ \ | | |/ | |/|
| | * Add missing words in the documentationBaptiste Mille-Mathias2016-10-221-1/+1
| |/
| * Merge pull request #2481 from wallabag/some-fixesNicolas Lœuillet2016-10-2129-19/+68
| |\
| | * Update Twitter cards descriptionJeremy Benoist2016-10-211-1/+1
| | * Update translation for piwik_hostJeremy Benoist2016-10-2113-13/+13
| | * Fix missing translationsJeremy Benoist2016-10-2111-0/+33
| | * Fix testJeremy Benoist2016-10-201-1/+1
| | * Requeue depending on producerJeremy Benoist2016-10-201-0/+12
| | * Avoid RabbitMQ consumer to loopJeremy Benoist2016-10-201-2/+3
| | * Translate dateJeremy Benoist2016-10-201-1/+4
| | * Fix french translationJeremy Benoist2016-10-201-1/+1
| * | Merge pull request #2482 from wallabag/avoid-bad-refreshNicolas Lœuillet2016-10-216-2/+53
| |\ \ | | |/ | |/|
| | * This test doesn’t require an internet connectionJeremy Benoist2016-10-201-2/+0
| | * If reload content failed, don’t update itJeremy Benoist2016-10-206-2/+55
| |/
| * 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