Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
| |/ | ||||||
| * | Merge pull request #2536 from wallabag/prepare-213 | Nicolas Lœuillet | 2016-11-04 | 6 | -889/+465 | |
| |\ | | | | | | | Prepare wallabag 2.1.3 :rocket: | |||||
| | * | Update CHANGELOG | Nicolas Lœuillet | 2016-11-04 | 2 | -920/+458 | |
| | | | | | | | | | | | | Usage of github-changes from @lalitkapoor | |||||
| | * | Prepare wallabag 2.1.3 :rocket: | Nicolas Lœuillet | 2016-11-04 | 6 | -19/+57 | |
| |/ | ||||||
| * | Merge pull request #2460 from wallabag/ui-changes | Nicolas Lœuillet | 2016-11-04 | 13 | -135/+233 | |
| |\ | | | | | | | UI Changes | |||||
| | * | Deal with more resolution issues | Thomas Citharel | 2016-11-03 | 4 | -6/+22 | |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
| | * | Fix resolution issues and 'title' issues | Thomas Citharel | 2016-11-03 | 6 | -36/+47 | |
| | | | | | | | | | | | | | | | | | | Also, modify editorconfig for css files. Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
| | * | Re-add bottom pagination | Jeremy Benoist | 2016-10-22 | 10 | -76/+68 | |
| | | | | | | | | | | | | Also pager.html.twig wasn’t necessary, there weren't enough duplication to put them in a dedicated template | |||||
| | * | remove padding on small widths | Thomas Citharel | 2016-10-22 | 3 | -2/+6 | |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
| | * | WIP | Thomas Citharel | 2016-10-22 | 5 | -59/+134 | |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
| * | | Merge pull request #2534 from wallabag/default-sort | Nicolas Lœuillet | 2016-11-04 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | Use created_at as default sort | |||||
| | * | | Use created_at as default sort | Jeremy Benoist | 2016-11-04 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | | | | Imported content use the real creation date. If we sort by id, it'll display contents in reverse order. | |||||
* | | | Merge pull request #2600 from wallabag/install-assets | Jeremy Benoist | 2016-11-19 | 1 | -0/+2 | |
|\ \ \ | | | | | | | | | Install assets for shortcuts | |||||
| * | | | Install assets for shortcuts | Jeremy Benoist | 2016-11-18 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Merge pull request #2601 from wallabag/store-http-status | Nicolas Lœuillet | 2016-11-19 | 23 | -0/+196 | |
|\ \ \ \ | |/ / / |/| | | | Added http_status in Entry entity | |||||
| * | | | Check if status code is OK | Nicolas Lœuillet | 2016-11-18 | 2 | -0/+24 | |
| | | | | ||||||
| * | | | Replace http status with a string | Nicolas Lœuillet | 2016-11-18 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | I don't want to have 0 if we don't fetch status code, I think it's better to have an empty string, mainly for filters | |||||
| * | | | Added http_status in Entry entity | Nicolas Lœuillet | 2016-11-18 | 23 | -0/+172 | |
|/ / / | ||||||
* | | | Merge pull request #2593 from wallabag/test-clarify | Jeremy Benoist | 2016-11-18 | 7 | -28/+28 | |
|\ \ \ | | | | | | | | | Put log in the most common failure tests | |||||
| * | | | Fix tests | Jeremy Benoist | 2016-11-17 | 1 | -5/+5 | |
| | | | | ||||||
| * | | | Put log in the most common failure tests | Jeremy Benoist | 2016-11-17 | 7 | -26/+26 | |
| | | | | | | | | | | | | | | | | So we’ll quickly be able to see what kind of test is failing when viewing Travis | |||||
* | | | | Merge pull request #2592 from wallabag/mruminski-patch-1 | Jeremy Benoist | 2016-11-17 | 1 | -3/+3 | |
|\ \ \ \ | |/ / / |/| | | | Update messages.pl.yml | |||||
| * | | | Update messages.pl.yml | Mateusz Rumiński | 2016-11-17 | 1 | -3/+3 | |
|/ / / | | | | | | | translate action_mark_as_read section to polish | |||||
* | | | Merge pull request #2547 from wallabag/add-option-markasread | Jeremy Benoist | 2016-11-17 | 28 | -39/+335 | |
|\ \ \ | | | | | | | | | Added a configuration to define the redirection after archiving an entry |