Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Re-user JsonResponse | Jeremy Benoist | 2016-09-08 | 1 | -40/+27 | |
|/ / | ||||||
* | | Merge pull request #2266 from wallabag/add-tags-counter | Jeremy Benoist | 2016-09-05 | 8 | -41/+63 | |
|\ \ | ||||||
| * | | Returned 0 instead of returning empty array for Twig Extension | Nicolas Lœuillet | 2016-09-05 | 1 | -2/+2 | |
| * | | Remove useless variable | Nicolas Lœuillet | 2016-09-05 | 1 | -2/+0 | |
| * | | Switched enableCache visibility to private | Nicolas Lœuillet | 2016-09-04 | 1 | -1/+1 | |
| * | | Added tags counter in sidebar (material theme) | Nicolas Lœuillet | 2016-09-04 | 8 | -38/+62 | |
* | | | Merge pull request #2267 from wallabag/Quent-in-patch-1 | Jeremy Benoist | 2016-09-05 | 1 | -14/+14 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Occitan updated | Quent-in | 2016-09-05 | 1 | -14/+14 | |
|/ / | ||||||
* | | Merge pull request #2263 from wallabag/speed-up-count | Jeremy Benoist | 2016-09-04 | 3 | -26/+51 | |
|\ \ | ||||||
| * | | CS | Jeremy Benoist | 2016-09-03 | 1 | -3/+3 | |
| * | | Remove Twig globals | Jeremy Benoist | 2016-09-03 | 2 | -23/+48 | |
| * | | Instead of selecting the whole data, just count it | Jeremy Benoist | 2016-09-03 | 2 | -13/+13 | |
|/ / | ||||||
* | | Merge pull request #2002 from wallabag/feature-display-itemsNumber | Jeremy Benoist | 2016-09-03 | 10 | -5/+95 | |
|\ \ | ||||||
| * | | Store cache lifetime in config | Nicolas Lœuillet | 2016-09-03 | 6 | -2/+24 | |
| * | | Enable cache for queries | Nicolas Lœuillet | 2016-09-01 | 2 | -8/+36 | |
| * | | Implement Twig_Extension_GlobalsInterface to remove deprecation | Nicolas Lœuillet | 2016-08-23 | 1 | -1/+1 | |
| * | | Display entries number for each category | Nicolas Lœuillet | 2016-08-23 | 4 | -4/+44 | |
* | | | Merge pull request #2260 from wallabag/fix-config-fontsize | Nicolas Lœuillet | 2016-09-02 | 2 | -0/+6 | |
|\ \ \ | ||||||
| * | | | Fixed different font-size for labels in config screen | Nicolas Lœuillet | 2016-09-02 | 2 | -0/+6 | |
|/ / / | ||||||
* | | | Merge pull request #2252 from wallabag/fix-last-merge | Nicolas Lœuillet | 2016-09-02 | 6 | -108/+4 | |
|\ \ \ | ||||||
| * | | | Add tinydot to material concat | Jeremy Benoist | 2016-09-02 | 1 | -0/+1 | |
| * | | | Fixed last merge who caused CSS/JS bugs | Nicolas Lœuillet | 2016-08-30 | 5 | -108/+3 | |
* | | | | Merge pull request #2242 from wallabag/fix-minor-css | Jeremy Benoist | 2016-09-01 | 4 | -26/+45 | |
|\ \ \ \ | ||||||
| * | | | | CSS indentation | Nicolas Lœuillet | 2016-09-01 | 1 | -2/+2 | |
| * | | | | Fixed print view for baggy theme | Nicolas Lœuillet | 2016-08-26 | 2 | -21/+26 | |
| * | | | | Fix print / article views | Nicolas Lœuillet | 2016-08-26 | 2 | -5/+19 | |
* | | | | | Merge pull request #2258 from mruminski/2.1 | Nicolas Lœuillet | 2016-09-01 | 1 | -10/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | Update messages.pl.yml | Mateusz Rumiński | 2016-09-01 | 1 | -10/+10 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2255 from wallabag/readability | Jeremy Benoist | 2016-09-01 | 24 | -17/+716 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Added documentation for Readability migration | Nicolas Lœuillet | 2016-09-01 | 2 | -9/+32 | |
| * | | | | Add Readability to Quickstart page | Jeremy Benoist | 2016-09-01 | 12 | -0/+12 | |
| * | | | | Add tests on ReadabilityImport | Jeremy Benoist | 2016-09-01 | 4 | -2/+297 | |
| * | | | | Add missing translations | Jeremy Benoist | 2016-09-01 | 11 | -8/+49 | |
| * | | | | Fix import count tests | Jeremy Benoist | 2016-09-01 | 1 | -1/+1 | |
| * | | | | Add Readability import | Jeremy Benoist | 2016-09-01 | 6 | -0/+328 | |
|/ / / / | ||||||
* | | | | Merge remote-tracking branch 'origin/master' into 2.1 | Jeremy Benoist | 2016-08-28 | 13 | -6/+192 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | Occitan version | Quent-in | 2016-08-27 | 1 | -0/+11 | |
| * | | | Merge pull request #2241 from modos189/v2-issue-1991 | Jeremy Benoist | 2016-08-26 | 1 | -0/+4 | |
| |\ \ \ | ||||||
| | * | | | Fix issue #1991: correction of the height field to add articles | Alexandr Danilov | 2016-08-26 | 1 | -0/+4 | |
| |/ / / | ||||||
| * | | | Merge pull request #2238 from modos189/v2-improve-view | Thomas Citharel | 2016-08-25 | 5 | -18/+83 | |
| |\ \ \ | ||||||
| | * | | | A new version of the plugin tinydot with update on window resize | Alexandr Danilov | 2016-08-25 | 3 | -17/+81 | |
| | * | | | Changes in the login form: | Alexandr Danilov | 2016-08-25 | 2 | -1/+2 | |
| |/ / / | ||||||
| * | | | Merge pull request #2236 from wallabag/allow-failure-php-7.1 | Jeremy Benoist | 2016-08-24 | 1 | -0/+1 | |
| |\ \ \ | ||||||
| | * | | | Allow failure for PHP 7.1 | Jeremy Benoist | 2016-08-24 | 1 | -0/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #2234 from cstuder/patch-1 | Nicolas Lœuillet | 2016-08-24 | 3 | -3/+3 | |
| |\ \ \ | ||||||
| | * | | | Fixes mailto link in german translation | Christian Studer | 2016-08-24 | 1 | -1/+1 | |
| | * | | | Fixes mailto link in french translation | Christian Studer | 2016-08-24 | 1 | -1/+1 | |
| | * | | | Fixes mailto link | Christian Studer | 2016-08-24 | 1 | -1/+1 | |
| * | | | | Merge pull request #2235 from wallabag/german-doc-config | Nicolas Lœuillet | 2016-08-24 | 2 | -0/+57 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Add configuration for german documentation | Nicolas Lœuillet | 2016-08-24 | 2 | -0/+57 | |
| |/ / / |