aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2180 from wallabag/download-picturesJeremy Benoist2016-11-0372-86/+1051
|\ | | | | Download pictures
| * Add warning message for import + download imagesJeremy Benoist2016-11-0319-4/+81
| | | | | | | | | | When import isn't async and downloading images is enabled, we warn the user that import can fail. Also, added missing translations
| * CSJeremy Benoist2016-11-021-2/+0
| |
| * Add more importer to wallabag:import commandJeremy Benoist2016-11-021-10/+16
| | | | | | | | All importer available expect Pocket which require an oAuth login.
| * Add entry.saved event to import & restJeremy Benoist2016-11-0217-49/+222
| |
| * Use custom event instead of Doctrine onesJeremy Benoist2016-11-018-126/+202
| | | | | | | | This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry.
| * Add translations & migrationJeremy Benoist2016-10-3115-35/+62
| |
| * Ability to enable/disable downloading imagesJeremy Benoist2016-10-304-0/+78
| | | | | | | | | | This will speed up the test suite because it won’t download everything when we add new entry… Add a custom test with downloading image enabled
| * Move settings before EntryJeremy Benoist2016-10-301-1/+1
| | | | | | | | Because we need wallabag_url to be defined when we’ll insert entries
| * 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
| | | | | | | | Needs to rewrite them properly (get base url)
| * 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
|\ \ | |/ |/| Added QRCode and link to configure android application
| * avoid eslint warning by disabling lineThomas Citharel2016-11-035-35/+36
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
| * 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
|\ | | | | Added relation between API Client and User
| * 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
|/ | | | Fix #2062
* Merge pull request #2496 from wallabag/mruminski-patch-1Nicolas Lœuillet2016-10-241-10/+10
|\ | | | | Update messages.pl.yml
| * Update messages.pl.ymlMateusz Rumiński2016-10-241-10/+10
|/ | | translate reset section to polish
* 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
| |\ | | | | | | Added :fr: documentation for wallabag backup
| | * 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 Wallabag
| | * Document what to backup in WallabagBaptiste Mille-Mathias2016-10-222-0/+27
| | | | | | | | | | | | Fixes issue #2479
| * | Merge pull request #2485 from bmillemathias/fix_android_documentationJeremy Benoist2016-10-221-1/+1
| |\ \ | | |/ | |/| Fix missing words in Android application documentation
| | * 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
| |\ | | | | | | Some fixes
| | * 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
| | | | | | | | | | | | Browser import can requeue message from `parseEntry` but we should take care of the way import are handled (depending on the producer)
| | * Avoid RabbitMQ consumer to loopJeremy Benoist2016-10-201-2/+3
| | | | | | | | | | | | When the `parseEntry` returns null it means the entry already exists in the database. Sending `false` as return, will requeue the message which will then loop forever.
| | * Translate dateJeremy Benoist2016-10-201-1/+4
| | | | | | | | | | | | I use a kind of hacky way to convert the user locale (defined with 2 letters, like `fr`) into a local with 5 letters (like `fr_FR`). I guess it should work on most of the case..
| | * Fix french translationJeremy Benoist2016-10-201-1/+1
| | |
| * | Merge pull request #2482 from wallabag/avoid-bad-refreshNicolas Lœuillet2016-10-216-2/+53
| |\ \ | | |/ | |/| If reload content failed, don’t update it
| | * 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
| |/ | | | | | | In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.
| * Merge pull request #2467 from wallabag/version-213devJeremy Benoist2016-10-171-1/+1
| |\ | | | | | | Update wallabag version for master branch