aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Update messages.pl.ymlMateusz Rumiński2016-09-291-2/+2
| | | add missing translation for Instapaper importer
* Merge pull request #2313 from wallabag/fix-long-loadingJeremy Benoist2016-09-271-1/+0
|\ | | | | Remove CSS class who caused long loading on Firefox
| * Remove CSS class who caused long loading on FirefoxNicolas Lœuillet2016-09-271-1/+0
|/ | | | Fix #2302 #2281
* Add Instapaper translationsJeremy Benoist2016-09-2711-52/+96
|
* Add Instapaper docsJeremy Benoist2016-09-272-9/+30
|
* Add controller test for InstapaperJeremy Benoist2016-09-276-0/+221
|
* Add Instapaper importJeremy Benoist2016-09-2713-5/+547
| | | | Also update ImportController with latest import (chrome, firefox & instapaper).
* Merge pull request #2309 from mruminski/2.1Jeremy Benoist2016-09-271-12/+12
|\ | | | | Update messages.pl.yml
| * Update messages.pl.ymlMateusz Rumiński2016-09-271-12/+12
|/ | | add missing translation for Firefox and Chrome imports
* Merge pull request #2192 from wallabag/import-browser-bookmarksJeremy Benoist2016-09-2635-11/+1657
|\ | | | | Import Firefox & Chrome bookmarks into wallabag
| * Added tags for Firefox importNicolas Lœuillet2016-09-262-1/+2
| |
| * Move prepareEntry to dedicated placeJeremy Benoist2016-09-263-35/+42
| | | | | | | | | | Yeah first try was ugly, now each part are in the dedicated place. Also, the date is hardly truncated to 10 chars because Firefox date are 16 chars long and Chrome are 17 chars long. So instead of divised them by a huge number, I prefer to truncate them.
| * Update Firefox fileJeremy Benoist2016-09-254-78/+91
| | | | | | | | | | With real data, the previous looks more than a Chrome converted file. Also, fix date conversion (hope so).
| * Fix bad date format in Browser importJeremy Benoist2016-09-255-62/+31
| |
| * Fix bad parameter for testsJeremy Benoist2016-09-251-1/+1
| |
| * Fixed tests by removing clear()Nicolas Lœuillet2016-09-251-4/+0
| |
| * fix testsThomas Citharel2016-09-256-52/+51
| |
| * cs & fixesThomas Citharel2016-09-256-33/+40
| |
| * bring chrome and firefox as separate importsThomas Citharel2016-09-2529-224/+1237
| |
| * Added tests for Chrome bookmarks importNicolas Lœuillet2016-09-254-3/+75
| |
| * Indentation and renamed fixtures fileNicolas Lœuillet2016-09-2511-28/+28
| |
| * Add Chrome path for Mac OSNicolas Lœuillet2016-09-256-15/+5
| |
| * Import Firefox & Chrome bookmarks into wallabagThomas Citharel2016-09-2519-7/+586
| |
* | Merge pull request #2308 from wallabag/tags-duplicateThomas Citharel2016-09-2511-58/+136
|\ \ | |/ |/| Fix duplicate tags on import
| * Fix tag count for PostgreSQLJeremy Benoist2016-09-252-8/+6
| |
| * CSJeremy Benoist2016-09-253-6/+4
| |
| * Use scheduled entity insertions to avoid tag duplicateJeremy Benoist2016-09-257-7/+89
| | | | | | | | Using `getScheduledEntityInsertions()` we can retrieve not yet flushed but already persisted entities and then avoid tags duplication on import.
| * Fix tags count in menuJeremy Benoist2016-09-254-47/+47
|/ | | | Move enable cache for Tag in the Entity because function `find*` should return result and not a Query
* Merge pull request #2306 from wallabag/redis-rabbit-checkThomas Citharel2016-09-2519-16/+89
|\ | | | | Some checks about Redis & RabbitMQ
| * Avoid failing test for user who didn’t install RedisJeremy Benoist2016-09-245-0/+19
| |
| * Display a message when async import won’t workJeremy Benoist2016-09-2413-16/+69
| | | | | | | | | | Mostly if Redis or RabbitMQ isn’t installed / launched. I guess it’ll avoid some issues.
| * Disable deprecation that fail testJeremy Benoist2016-09-241-0/+1
|/
* Merge pull request #2301 from wallabag/fix-rss-feedsJeremy Benoist2016-09-222-18/+2
|\ | | | | fix feeds not syncing on android app
| * fix feeds not syncing on android appThomas Citharel2016-09-212-18/+2
| |
* | Merge pull request #2239 from wallabag/documentation-2.1Nicolas Lœuillet2016-09-2013-32/+61
|\ \ | | | | | | Update documentation with new features for 2.1
| * | Fixed version in documentationNicolas Lœuillet2016-09-192-2/+2
| | |
| * | Fix wallabag version in documentationNicolas Lœuillet2016-09-196-31/+13
| | |
| * | Add documentation about article sharingNicolas Lœuillet2016-09-1910-17/+64
| | |
* | | Merge pull request #2299 from mruminski/2.1Thomas Citharel2016-09-203-13/+24
|\ \ \ | |/ / |/| | polish version
| * | Update CraueConfigBundle.pl.ymlMateusz Rumiński2016-09-191-1/+1
| | | | | | | | | fix misspell
| * | Update CraueConfigBundle.pl.ymlMateusz Rumiński2016-09-191-8/+8
| | | | | | | | | add missing translation
| * | Update messages.pl.ymlMateusz Rumiński2016-09-191-5/+5
| | | | | | | | | add missing translation
| * | Update wallabag_user.pl.ymlMateusz Rumiński2016-09-191-1/+1
| | | | | | | | | add missing "
| * | polish versionMateusz Rumiński2016-09-191-0/+11
|/ / | | | | create wallabag_user.pl.yml file
* | Update generated files from SymfonyJeremy Benoist2016-09-191-3/+3
| |
* | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-09-1912-18/+76
|\|
| * Merge pull request #2297 from morhelluin/epub-export-special-charsJeremy Benoist2016-09-191-1/+5
| |\ | | | | | | Fix issue #2296: epub export with special chars in the title.
| | * Fix issue #2296: epub export with `+` in the title.Étienne Gilli2016-09-181-1/+5
| |/
| * Update md5 checksum for 2.0.8 in documentationNicolas Lœuillet2016-09-076-6/+6
| |
| * Merge pull request #2271 from wallabag/prepare-208Nicolas Lœuillet2016-09-079-11/+29
| |\ | | | | | | Prepare wallabag 2.0.8