Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update messages.pl.yml | Mateusz Rumiński | 2016-09-29 | 1 | -2/+2 |
| | | | add missing translation for Instapaper importer | ||||
* | Merge pull request #2313 from wallabag/fix-long-loading | Jeremy Benoist | 2016-09-27 | 1 | -1/+0 |
|\ | | | | | Remove CSS class who caused long loading on Firefox | ||||
| * | Remove CSS class who caused long loading on Firefox | Nicolas Lœuillet | 2016-09-27 | 1 | -1/+0 |
|/ | | | | Fix #2302 #2281 | ||||
* | Add Instapaper translations | Jeremy Benoist | 2016-09-27 | 11 | -52/+96 |
| | |||||
* | Add Instapaper docs | Jeremy Benoist | 2016-09-27 | 2 | -9/+30 |
| | |||||
* | Add controller test for Instapaper | Jeremy Benoist | 2016-09-27 | 6 | -0/+221 |
| | |||||
* | Add Instapaper import | Jeremy Benoist | 2016-09-27 | 13 | -5/+547 |
| | | | | Also update ImportController with latest import (chrome, firefox & instapaper). | ||||
* | Merge pull request #2309 from mruminski/2.1 | Jeremy Benoist | 2016-09-27 | 1 | -12/+12 |
|\ | | | | | Update messages.pl.yml | ||||
| * | Update messages.pl.yml | Mateusz Rumiński | 2016-09-27 | 1 | -12/+12 |
|/ | | | add missing translation for Firefox and Chrome imports | ||||
* | Merge pull request #2192 from wallabag/import-browser-bookmarks | Jeremy Benoist | 2016-09-26 | 35 | -11/+1657 |
|\ | | | | | Import Firefox & Chrome bookmarks into wallabag | ||||
| * | Added tags for Firefox import | Nicolas Lœuillet | 2016-09-26 | 2 | -1/+2 |
| | | |||||
| * | Move prepareEntry to dedicated place | Jeremy Benoist | 2016-09-26 | 3 | -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 file | Jeremy Benoist | 2016-09-25 | 4 | -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 import | Jeremy Benoist | 2016-09-25 | 5 | -62/+31 |
| | | |||||
| * | Fix bad parameter for tests | Jeremy Benoist | 2016-09-25 | 1 | -1/+1 |
| | | |||||
| * | Fixed tests by removing clear() | Nicolas Lœuillet | 2016-09-25 | 1 | -4/+0 |
| | | |||||
| * | fix tests | Thomas Citharel | 2016-09-25 | 6 | -52/+51 |
| | | |||||
| * | cs & fixes | Thomas Citharel | 2016-09-25 | 6 | -33/+40 |
| | | |||||
| * | bring chrome and firefox as separate imports | Thomas Citharel | 2016-09-25 | 29 | -224/+1237 |
| | | |||||
| * | Added tests for Chrome bookmarks import | Nicolas Lœuillet | 2016-09-25 | 4 | -3/+75 |
| | | |||||
| * | Indentation and renamed fixtures file | Nicolas Lœuillet | 2016-09-25 | 11 | -28/+28 |
| | | |||||
| * | Add Chrome path for Mac OS | Nicolas Lœuillet | 2016-09-25 | 6 | -15/+5 |
| | | |||||
| * | Import Firefox & Chrome bookmarks into wallabag | Thomas Citharel | 2016-09-25 | 19 | -7/+586 |
| | | |||||
* | | Merge pull request #2308 from wallabag/tags-duplicate | Thomas Citharel | 2016-09-25 | 11 | -58/+136 |
|\ \ | |/ |/| | Fix duplicate tags on import | ||||
| * | Fix tag count for PostgreSQL | Jeremy Benoist | 2016-09-25 | 2 | -8/+6 |
| | | |||||
| * | CS | Jeremy Benoist | 2016-09-25 | 3 | -6/+4 |
| | | |||||
| * | Use scheduled entity insertions to avoid tag duplicate | Jeremy Benoist | 2016-09-25 | 7 | -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 menu | Jeremy Benoist | 2016-09-25 | 4 | -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-check | Thomas Citharel | 2016-09-25 | 19 | -16/+89 |
|\ | | | | | Some checks about Redis & RabbitMQ | ||||
| * | Avoid failing test for user who didn’t install Redis | Jeremy Benoist | 2016-09-24 | 5 | -0/+19 |
| | | |||||
| * | Display a message when async import won’t work | Jeremy Benoist | 2016-09-24 | 13 | -16/+69 |
| | | | | | | | | | | Mostly if Redis or RabbitMQ isn’t installed / launched. I guess it’ll avoid some issues. | ||||
| * | Disable deprecation that fail test | Jeremy Benoist | 2016-09-24 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #2301 from wallabag/fix-rss-feeds | Jeremy Benoist | 2016-09-22 | 2 | -18/+2 |
|\ | | | | | fix feeds not syncing on android app | ||||
| * | fix feeds not syncing on android app | Thomas Citharel | 2016-09-21 | 2 | -18/+2 |
| | | |||||
* | | Merge pull request #2239 from wallabag/documentation-2.1 | Nicolas Lœuillet | 2016-09-20 | 13 | -32/+61 |
|\ \ | | | | | | | Update documentation with new features for 2.1 | ||||
| * | | Fixed version in documentation | Nicolas Lœuillet | 2016-09-19 | 2 | -2/+2 |
| | | | |||||
| * | | Fix wallabag version in documentation | Nicolas Lœuillet | 2016-09-19 | 6 | -31/+13 |
| | | | |||||
| * | | Add documentation about article sharing | Nicolas Lœuillet | 2016-09-19 | 10 | -17/+64 |
| | | | |||||
* | | | Merge pull request #2299 from mruminski/2.1 | Thomas Citharel | 2016-09-20 | 3 | -13/+24 |
|\ \ \ | |/ / |/| | | polish version | ||||
| * | | Update CraueConfigBundle.pl.yml | Mateusz Rumiński | 2016-09-19 | 1 | -1/+1 |
| | | | | | | | | | fix misspell | ||||
| * | | Update CraueConfigBundle.pl.yml | Mateusz Rumiński | 2016-09-19 | 1 | -8/+8 |
| | | | | | | | | | add missing translation | ||||
| * | | Update messages.pl.yml | Mateusz Rumiński | 2016-09-19 | 1 | -5/+5 |
| | | | | | | | | | add missing translation | ||||
| * | | Update wallabag_user.pl.yml | Mateusz Rumiński | 2016-09-19 | 1 | -1/+1 |
| | | | | | | | | | add missing " | ||||
| * | | polish version | Mateusz Rumiński | 2016-09-19 | 1 | -0/+11 |
|/ / | | | | | create wallabag_user.pl.yml file | ||||
* | | Update generated files from Symfony | Jeremy Benoist | 2016-09-19 | 1 | -3/+3 |
| | | |||||
* | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-09-19 | 12 | -18/+76 |
|\| | |||||
| * | Merge pull request #2297 from morhelluin/epub-export-special-chars | Jeremy Benoist | 2016-09-19 | 1 | -1/+5 |
| |\ | | | | | | | Fix issue #2296: epub export with special chars in the title. | ||||
| | * | Fix issue #2296: epub export with `+` in the title. | Étienne Gilli | 2016-09-18 | 1 | -1/+5 |
| |/ | |||||
| * | Update md5 checksum for 2.0.8 in documentation | Nicolas Lœuillet | 2016-09-07 | 6 | -6/+6 |
| | | |||||
| * | Merge pull request #2271 from wallabag/prepare-208 | Nicolas Lœuillet | 2016-09-07 | 9 | -11/+29 |
| |\ | | | | | | | Prepare wallabag 2.0.8 |