Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #2530 from wallabag/add-doc-failed-load-external-entity | Nicolas Lœuillet | 2016-11-02 | 3 | -0/+21 |
|\ \ | | | | | | | Added documentation about failed to load external entity error | ||||
| * | | Update faq.rst | Jeremy Benoist | 2016-11-02 | 1 | -1/+1 |
| | | | |||||
| * | | update German faq.rst | Strubbl | 2016-11-02 | 1 | -2/+2 |
| | | | |||||
| * | | update German faq.rst | Strubbl | 2016-11-02 | 1 | -4/+4 |
| | | | |||||
| * | | Added more info about Doctrine / PHP bug | Nicolas Lœuillet | 2016-11-02 | 3 | -0/+6 |
| | | | |||||
| * | | Added documentation about failed to load external entity error | Nicolas Lœuillet | 2016-11-02 | 3 | -0/+15 |
|/ / | | | | | | | Fix #2529 | ||||
* | | Merge pull request #2519 from Jibec/master | Jeremy Benoist | 2016-11-02 | 4 | -373/+373 |
|\ \ | | | | | | | Translation update - French | ||||
| * | | wallabag is full lowercase | Jeremy Benoist | 2016-11-02 | 1 | -7/+7 |
| | | | |||||
| * | | Translation - French - tiny typo | Jean-Baptiste | 2016-10-31 | 1 | -1/+1 |
| | | | |||||
| * | | Translation - French - tiny escape correction | Jean-Baptiste | 2016-10-31 | 1 | -24/+24 |
| | | | |||||
| * | | Translation - French - tiny escape correction | Jean-Baptiste | 2016-10-31 | 1 | -1/+1 |
| | | | |||||
| * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 1 | -4/+4 |
| | | | |||||
| * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 2 | -367/+367 |
| | | | |||||
| * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 0 | -0/+0 |
| | | | |||||
| * | | Translation update - French | Jean-Baptiste | 2016-10-30 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #2528 from Kdecherf/slashdot-cookie | Jeremy Benoist | 2016-11-01 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Force user-agent for .slashdot.org | ||||
| * | | | Force user-agent for .slashdot.org | Kevin Decherf | 2016-11-01 | 1 | -0/+1 |
|/ / / | | | | | | | | | | | | | | | | | | | | | | Slashdot replaces actual content with a form regarding cookies when requests originate from France. By forcing the user-agent, the warning seems to go away. Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | | Merge pull request #2524 from lologhi/instapaper-cli-import | Nicolas Lœuillet | 2016-11-01 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | Add Instapaper to CLI import | ||||
| * | | | Add Instapaper to CLI import | Laurent | 2016-11-01 | 1 | -0/+3 |
|/ / / | |||||
* | | | Merge pull request #2521 from foxmask/master | Nicolas Lœuillet | 2016-10-31 | 3 | -9/+9 |
|\ \ \ | | | | | | | | | fix path for the install scripts | ||||
| * | | | fix path for in install scripts | FoxMaSk | 2016-10-30 | 3 | -3/+3 |
| | | | | |||||
| * | | | fix path for in install scripts | FoxMaSk | 2016-10-30 | 3 | -9/+9 |
| | | | |