Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Avoid duplicate url with accents | Jeremy Benoist | 2016-10-01 | 2 | -1/+36 |
| | |||||
* | Merge pull request #2322 from wallabag/v2-404 | Nicolas Lœuillet | 2016-10-01 | 7 | -9/+107 |
|\ | | | | | Customize errors templates | ||||
| * | Customize errors templates | Jeremy Benoist | 2016-10-01 | 7 | -9/+107 |
| | | | | | | | | All error goes to the same template which only display the error message and the status code. | ||||
* | | Merge pull request #2320 from wallabag/user-config | Nicolas Lœuillet | 2016-10-01 | 7 | -43/+51 |
|\ \ | |/ |/| | Create user config in one place. | ||||
| * | Fix bad template name | Jeremy Benoist | 2016-09-30 | 1 | -0/+0 |
| | | | | | | | | | | When a user register, the template displayed saying it should now check its email was misspelled. Resulting in displaying the default one (with margin issue). | ||||
| * | Create user config in one place | Jeremy Benoist | 2016-09-30 | 6 | -43/+51 |
|/ | | | | | | | | Using a listener, user config is now created when a user: - is created from the command line - register (with or without email confirmation) - is created from the config panel | ||||
* | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-09-30 | 4 | -5/+6 |
|\ | |||||
| * | Merge pull request #2319 from pmartin/docker-php-gd-extension | Jeremy Benoist | 2016-09-30 | 4 | -5/+6 |
| |\ | | | | | | | Docker : install PHP 'gd' extension | ||||
| | * | Add PHP 'gd' extension to docker | Pascal MARTIN | 2016-09-30 | 1 | -2/+3 |
| | | | | | | | | | | | | The gd extension is required to export entries as EPUB. | ||||
| | * | Fix doc: 'bin/console' instead of 'app/console' | Pascal MARTIN | 2016-09-30 | 3 | -3/+3 |
| |/ | |||||
* | | Merge pull request #2318 from wallabag/refactor-templates | Nicolas Lœuillet | 2016-09-30 | 26 | -494/+18 |
|\ \ | | | | | | | Removed duplicated templates files | ||||
| * | | Removed duplicated templates files | Nicolas Lœuillet | 2016-09-30 | 26 | -494/+18 |
|/ / | |||||
* | | Merge pull request #2315 from wallabag/fixes-about-upgrade | Nicolas Lœuillet | 2016-09-29 | 23 | -33/+555 |
|\ \ | | | | | | | Fixes about upgrade | ||||
| * | | Added french documentation about Redis and RabbitMQ | Nicolas Lœuillet | 2016-09-29 | 6 | -11/+195 |
| | | | |||||
| * | | Added links to async config in german doc | Sven Fischer | 2016-09-29 | 1 | -0/+2 |
| | | | |||||
| * | | add German redis.rst | Sven Fischer | 2016-09-29 | 1 | -0/+62 |
| | | | |||||
| * | | add German rabbitmq.rst | Sven Fischer | 2016-09-29 | 1 | -0/+67 |
| | | | |||||
| * | | Added links to async config in french doc | Nicolas Lœuillet | 2016-09-28 | 1 | -0/+2 |
| | | | |||||
| * | | Added links to async config in english doc | Nicolas Lœuillet | 2016-09-28 | 1 | -0/+2 |
| | | | |||||
| * | | Little improvements to the german translation | Julian Oster | 2016-09-28 | 1 | -4/+4 |
| | | | |||||
| * | | update German upgrade-2.0.x-2.1.y.rst | Strubbl | 2016-09-28 | 1 | -3/+3 |
| | | | |||||
| * | | Fixed review | Nicolas Lœuillet | 2016-09-28 | 7 | -7/+49 |
| | | | |||||
| * | | Reordered upgrade documentation | Nicolas Lœuillet | 2016-09-28 | 10 | -22/+172 |
| | | | |||||
| * | | Some fixes about upgrade from 2.0.x -> 2.1.0 | Nicolas Lœuillet | 2016-09-28 | 11 | -11/+22 |
| | | | |||||
* | | | Merge pull request #2316 from mruminski/2.1 | Jeremy Benoist | 2016-09-29 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Update messages.pl.yml | ||||
| * | | 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 |
| | | |