Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2328 from wallabag/avoid-duplicate-url | Nicolas Lœuillet | 2016-10-02 | 2 | -1/+45 |
|\ | | | | | Avoid duplicate url with accents | ||||
| * | Remove additional entry | Jeremy Benoist | 2016-10-02 | 1 | -0/+9 |
| | | | | | | | | After the test is done, cleanup what we’ve done | ||||
| * | Avoid duplicate url with accents | Jeremy Benoist | 2016-10-01 | 2 | -1/+36 |
| | | |||||
* | | Merge pull request #2326 from wallabag/update-quickstart | Jeremy Benoist | 2016-10-02 | 14 | -53/+171 |
|\ \ | | | | | | | Changed quickstart layout | ||||
| * | | Update test | Jeremy Benoist | 2016-10-02 | 1 | -1/+1 |
| | | | |||||
| * | | Fixed french translation | Nicolas Lœuillet | 2016-10-01 | 1 | -3/+3 |
| | | | |||||
| * | | Changed translations | Nicolas Lœuillet | 2016-10-01 | 11 | -10/+11 |
| | | | |||||
| * | | Changed quickstart layout | Nicolas Lœuillet | 2016-10-01 | 13 | -52/+169 |
| | | | |||||
* | | | Merge pull request #2324 from wallabag/edit-tagging-rule | Jeremy Benoist | 2016-10-02 | 14 | -17/+106 |
|\ \ \ | | | | | | | | | Add ability to edit a tagging rule | ||||
| * | | | CS | Jeremy Benoist | 2016-10-01 | 1 | -2/+2 |
| | | | | |||||
| * | | | Introduce validateRuleAction | Jeremy Benoist | 2016-10-01 | 1 | -5/+13 |
| | | | | |||||
| * | | | Add ability to edit a tagging rule | Jeremy Benoist | 2016-10-01 | 14 | -14/+95 |
| | |/ | |/| | |||||
* | | | Merge pull request #2323 from wallabag/footer-stats | Jeremy Benoist | 2016-10-02 | 15 | -5/+82 |
|\ \ \ | | | | | | | | | Add simple stats in footer | ||||
| * | | | Add simple stats in footer | Jeremy Benoist | 2016-10-01 | 15 | -5/+82 |
| | | | | |||||
* | | | | Merge pull request #2329 from wallabag/Quent-in-patch-1 | Jeremy Benoist | 2016-10-02 | 11 | -35/+37 |
|\ \ \ \ | |_|/ / |/| | | | Occitan version update | ||||
| * | | | Fix OC typos | Jeremy Benoist | 2016-10-02 | 11 | -20/+20 |
| | | | | | | | | | | | | | | | | + remove extra sentence | ||||
| * | | | Occitan version update | Quent-in | 2016-10-01 | 1 | -24/+26 |
|/ / / | | | | | | | to be ready for the future of Wallabag :) | ||||
* | | | 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 |