aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2180 from wallabag/download-picturesJeremy Benoist2016-11-0372-86/+1051
|\
| * Add warning message for import + download imagesJeremy Benoist2016-11-0319-4/+81
| * CSJeremy Benoist2016-11-021-2/+0
| * Add more importer to wallabag:import commandJeremy Benoist2016-11-021-10/+16
| * Add entry.saved event to import & restJeremy Benoist2016-11-0217-49/+222
| * Use custom event instead of Doctrine onesJeremy Benoist2016-11-018-126/+202
| * Add translations & migrationJeremy Benoist2016-10-3115-35/+62
| * Ability to enable/disable downloading imagesJeremy Benoist2016-10-304-0/+78
| * Move settings before EntryJeremy Benoist2016-10-301-1/+1
| * Add instance url to the downloaded imagesJeremy Benoist2016-10-303-2/+20
| * Fixing testsJeremy Benoist2016-10-307-23/+63
| * Use doctrine event to download imagesJeremy Benoist2016-10-306-128/+397
| * CleanupJeremy Benoist2016-10-302-3/+2
| * Move related event things in Event folderJeremy Benoist2016-10-308-9/+10
| * CSJeremy Benoist2016-10-292-37/+42
| * WorkingThomas Citharel2016-10-291-1/+43
| * Download pictures successfullyThomas Citharel2016-10-293-170/+158
| * first draft (from v1)Thomas Citharel2016-10-291-0/+168
* | Merge pull request #2523 from wallabag/qrcode-android-appNicolas Lœuillet2016-11-0319-38/+80
|\ \ | |/ |/|
| * avoid eslint warning by disabling lineThomas Citharel2016-11-035-35/+36
| * Fixed reviewNicolas Lœuillet2016-10-312-8/+8
| * Added translations and baggy partNicolas Lœuillet2016-10-3116-5/+26
| * Added QRCode and link to configure android applicationNicolas Lœuillet2016-10-318-39/+59
|/
* 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
| |\