Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2604 from wallabag/postgresql-version | Nicolas Lœuillet | 2016-11-19 | 1 | -1/+22 |
|\ | | | | | wallabag can’t work on PostgreSQL <= 9.1 | ||||
| * | Wallabag can’t work on PostgreSQL <= 9.1 | Jeremy Benoist | 2016-11-19 | 1 | -1/+22 |
| | | |||||
* | | Merge pull request #2605 from wallabag/update-release-process | Nicolas Lœuillet | 2016-11-19 | 1 | -1/+14 |
|\ \ | | | | | | | Add .travis.yml change to RELEASE_PROCESS | ||||
| * | | Add .travis.yml change to RELEASE_PROCESS | Jeremy Benoist | 2016-11-19 | 1 | -1/+14 |
| |/ | |||||
* | | Merge pull request #2603 from wallabag/fix-composer-no-dev | Jeremy Benoist | 2016-11-19 | 1 | -2/+2 |
|\ \ | |/ |/| | Fix clear-cache problem using —no-dev | ||||
| * | Fix clear-cache problem using —no-dev | Jeremy Benoist | 2016-11-19 | 1 | -2/+2 |
|/ | | | | | | Related to : > PHP Fatal error: Class 'FOS\RestBundle\Serializer\JMSSerializerAdapter' not found in /Users/j0k/Sites/github/wallabag/var/cache/prod/appProdProjectContainer.php on line 9139 | ||||
* | Merge pull request #2596 from wallabag/prepare-214 | Nicolas Lœuillet | 2016-11-18 | 2 | -1/+20 |
|\ | | | | | Prepare wallabag 2.1.4 :rocket: | ||||
| * | Prepare wallabag 2.1.4 :rocket: | Nicolas Lœuillet | 2016-11-18 | 2 | -1/+20 |
|/ | |||||
* | Merge pull request #2550 from wallabag/reorder-documentation | Nicolas Lœuillet | 2016-11-18 | 60 | -1418/+1681 |
|\ | | | | | Reordered documentation | ||||
| * | Undo translation of 'in english'. | Julian Oster | 2016-11-18 | 1 | -1/+1 |
| | | |||||
| * | Reordered documentation for German. | Julian Oster | 2016-11-17 | 19 | -485/+545 |
| | | |||||
| * | Update translation of link to german translation. | Julian Oster | 2016-11-17 | 2 | -2/+2 |
| | | |||||
| * | Reordered :fr: documentation | Nicolas Lœuillet | 2016-11-17 | 27 | -547/+654 |
| | | |||||
| * | Reordered documentation | Nicolas Lœuillet | 2016-11-17 | 18 | -389/+485 |
|/ | |||||
* | Merge pull request #2578 from wallabag/questionmark-icon | Nicolas Lœuillet | 2016-11-17 | 33 | -34/+170 |
|\ | | | | | Added help on config screen | ||||
| * | Added tooltips for baggy theme | Nicolas Lœuillet | 2016-11-17 | 1 | -0/+18 |
| | | |||||
| * | Added help on config screen | Nicolas Lœuillet | 2016-11-17 | 33 | -34/+152 |
|/ | |||||
* | Merge pull request #2570 from wallabag/add-creation-date | Jeremy Benoist | 2016-11-15 | 10 | -33/+43 |
|\ | | | | | Added creation date on entries view | ||||
| * | Hide creation date in mobile view | Nicolas Lœuillet | 2016-11-14 | 1 | -2/+2 |
| | | |||||
| * | Changed display for material theme | Nicolas Lœuillet | 2016-11-14 | 4 | -5/+6 |
| | | |||||
| * | Added creation date on entries view | Nicolas Lœuillet | 2016-11-14 | 8 | -30/+39 |
| | | |||||
* | | Merge pull request #2587 from wallabag/user-agents | Jeremy Benoist | 2016-11-15 | 1 | -15/+0 |
|\ \ | | | | | | | User-agents have moved to site-config | ||||
| * | | User-agents have moved to site-config | Jeremy Benoist | 2016-11-14 | 1 | -15/+0 |
|/ / | | | | | Since graby@1.5.0, user-agent can be defined in site-config, which the now recommended way | ||||
* | | Merge pull request #2584 from blankoworld/master | Jeremy Benoist | 2016-11-14 | 3 | -0/+18 |
|\ \ | |/ |/| | fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony | ||||
| * | fix #2582 - Nginx config: disable all other PHP file from symphony | Olivier DOSSMANN | 2016-11-14 | 3 | -0/+18 |
|/ | | | | | | | Regarding https://www.nginx.com/resources/wiki/start/topics/recipes/symfony/ we need to limit access to config.php and make_dev.php files from Nginx. That's why we return 404 error page for these files. | ||||
* | Merge pull request #2577 from wallabag/add-tooltip-material | Jeremy Benoist | 2016-11-14 | 1 | -3/+3 |
|\ | | | | | Added tooltips in header bar | ||||
| * | Added tooltips in header bar | Nicolas Lœuillet | 2016-11-12 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #2562 from wallabag/image-bigger | Thomas Citharel | 2016-11-14 | 12 | -99/+176 |
|\ \ | | | | | | | Bigger image preview in case of only image content | ||||
| * | | Display a bigger image in case of image content | Jeremy Benoist | 2016-11-08 | 10 | -97/+164 |
| | | | | | | | | | | | | | | | | | | If the content is only an image, we can display a bigger preview image because we won’t have text to display. Also, split different card view to avoid too much complexity in the entries.html.twig | ||||
| * | | Add `grunt watch` task | Jeremy Benoist | 2016-11-08 | 2 | -2/+8 |
| | | | |||||
| * | | Remove the left margin of tag | Jeremy Benoist | 2016-11-08 | 1 | -0/+4 |
| | | | | | | | | | | | | In the entries list, the first tag below the link isn’t stick to the left. Now it is. | ||||
* | | | Merge pull request #2571 from wallabag/change-language-without-logout | Nicolas Lœuillet | 2016-11-11 | 13 | -12/+14 |
|\ \ \ | |_|/ |/| | | Changed behavior when we change language | ||||
| * | | Changed behavior when we change language | Nicolas Lœuillet | 2016-11-10 | 13 | -12/+14 |
|/ / | | | | | | | No need to disconnect to apply the language substitution | ||||
* | | Merge pull request #2565 from wallabag/remove-support-website | Nicolas Lœuillet | 2016-11-09 | 12 | -12/+12 |
|\ \ | | | | | | | Removed support website on about page | ||||
| * | | Removed support website on about page | Nicolas Lœuillet | 2016-11-09 | 12 | -12/+12 |
|/ / | |||||
* | | Merge pull request #2563 from wallabag/pr-template | Nicolas Lœuillet | 2016-11-09 | 1 | -8/+13 |
|\ \ | |/ |/| | Improve PR template | ||||
| * | Improve PR template | Jeremy Benoist | 2016-11-08 | 1 | -8/+13 |
|/ | |||||
* | Merge pull request #2561 from wallabag/Rurik19-patch-2259 | Thomas Citharel | 2016-11-08 | 1 | -1/+1 |
|\ | | | | | fix #2559 | ||||
| * | fix #2559 | Yuriy Evdokimov | 2016-11-08 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2555 from dkrmr/fix_update_script | Nicolas Lœuillet | 2016-11-07 | 1 | -1/+1 |
|\ | | | | | Reorder variable assignation in update.sh script, fix #2554 | ||||
| * | Reorder variable assignation in update.sh script, fix #2554 | Darius Kramer | 2016-11-07 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #2556 from wallabag/replace-tokenstorage | Nicolas Lœuillet | 2016-11-07 | 2 | -10/+21 |
|\ \ | |/ |/| | Replaced TokenStorage with TokenStorageInterface | ||||
| * | PHP CS | Nicolas Lœuillet | 2016-11-07 | 1 | -3/+2 |
| | | |||||
| * | Replaced TokenStorage with TokenStorageInterface | Nicolas Lœuillet | 2016-11-07 | 2 | -7/+19 |
| | | |||||
* | | Merge pull request #2552 from wallabag/reading-time-round | Jeremy Benoist | 2016-11-06 | 1 | -1/+1 |
|\ \ | |/ |/| | Round readingtime to avoid crazy number | ||||
| * | Round readingtime to avoid crazy number | Jeremy Benoist | 2016-11-06 | 1 | -1/+1 |
|/ | | | | Like `8.666666666667 min` | ||||
* | Merge pull request #2546 from wallabag/update-parameters-doc | Nicolas Lœuillet | 2016-11-06 | 3 | -0/+9 |
|\ | | | | | Updated default parameters.yml file in documentation | ||||
| * | Updated default parameters.yml file in documentation | Nicolas Lœuillet | 2016-11-06 | 3 | -0/+9 |
|/ | |||||
* | Merge pull request #2545 from wallabag/update-doc | Nicolas Lœuillet | 2016-11-05 | 3 | -18/+3 |
|\ | | | | | Update the upgrade documentation | ||||
| * | Update the upgrade documentation | Nicolas Lœuillet | 2016-11-05 | 3 | -18/+3 |
|/ |