Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2320 from wallabag/user-config | Nicolas Lœuillet | 2016-10-01 | 7 | -43/+51 |
|\ | |||||
| * | Fix bad template name | Jeremy Benoist | 2016-09-30 | 1 | -0/+0 |
| * | Create user config in one place | Jeremy Benoist | 2016-09-30 | 6 | -43/+51 |
|/ | |||||
* | 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 |
| |\ | |||||
| | * | Add PHP 'gd' extension to docker | Pascal MARTIN | 2016-09-30 | 1 | -2/+3 |
| | * | 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 | 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 |
|\ \ | |||||
| * | | 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 | Mateusz Rumiński | 2016-09-29 | 1 | -2/+2 |
|/ / | |||||
* | | 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 | Nicolas Lœuillet | 2016-09-27 | 1 | -1/+0 |
|/ / | |||||
* | | 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 |
* | | Merge pull request #2309 from mruminski/2.1 | Jeremy Benoist | 2016-09-27 | 1 | -12/+12 |
|\ \ | |||||
| * | | Update messages.pl.yml | Mateusz Rumiński | 2016-09-27 | 1 | -12/+12 |
|/ / | |||||
* | | Merge pull request #2192 from wallabag/import-browser-bookmarks | Jeremy Benoist | 2016-09-26 | 35 | -11/+1657 |
|\ \ | |||||
| * | | 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 |
| * | | Update Firefox file | Jeremy Benoist | 2016-09-25 | 4 | -78/+91 |
| * | | 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 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 |
| * | | Fix tags count in menu | Jeremy Benoist | 2016-09-25 | 4 | -47/+47 |
|/ / |