aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Added tags counter in sidebar (material theme)Nicolas Lœuillet2016-09-048-38/+62
|
* Merge pull request #2263 from wallabag/speed-up-countJeremy Benoist2016-09-043-26/+51
|\ | | | | Instead of selecting the whole data, just count it
| * CSJeremy Benoist2016-09-031-3/+3
| |
| * Remove Twig globalsJeremy Benoist2016-09-032-23/+48
| | | | | | | | | | | | | | | | Twig Global function are called globally. This means even on a query to the api. Using a function we can decide when we want to call it. Also, remove previous `COUNT(e.id)` since it doesn't work on PostgreSQL ...
| * Instead of selecting the whole data, just count itJeremy Benoist2016-09-032-13/+13
|/ | | | | | Instead of performing a complex select (to retrieve all data for entry, etc...) just select the counter and retrieve it. Down from ~50ms to ~30ms on the unread page (with 500 items)
* Merge pull request #2002 from wallabag/feature-display-itemsNumberJeremy Benoist2016-09-0310-5/+95
|\ | | | | Feature display items number
| * Store cache lifetime in configNicolas Lœuillet2016-09-036-2/+24
| |
| * Enable cache for queriesNicolas Lœuillet2016-09-012-8/+36
| |
| * Implement Twig_Extension_GlobalsInterface to remove deprecationNicolas Lœuillet2016-08-231-1/+1
| |
| * Display entries number for each categoryNicolas Lœuillet2016-08-234-4/+44
| |
* | Merge pull request #2260 from wallabag/fix-config-fontsizeNicolas Lœuillet2016-09-022-0/+6
|\ \ | | | | | | Fixed different font-size for labels in config screen
| * | Fixed different font-size for labels in config screenNicolas Lœuillet2016-09-022-0/+6
|/ / | | | | | | Fix #1788
* | Merge pull request #2252 from wallabag/fix-last-mergeNicolas Lœuillet2016-09-026-108/+4
|\ \ | | | | | | Fixed last merge who caused CSS/JS bugs
| * | Add tinydot to material concatJeremy Benoist2016-09-021-0/+1
| | |
| * | Fixed last merge who caused CSS/JS bugsNicolas Lœuillet2016-08-305-108/+3
| | |
* | | Merge pull request #2242 from wallabag/fix-minor-cssJeremy Benoist2016-09-014-26/+45
|\ \ \ | | | | | | | | Fix print / article views
| * | | CSS indentationNicolas Lœuillet2016-09-011-2/+2
| | | |
| * | | Fixed print view for baggy themeNicolas Lœuillet2016-08-262-21/+26
| | | |
| * | | Fix print / article viewsNicolas Lœuillet2016-08-262-5/+19
| | | |
* | | | Merge pull request #2258 from mruminski/2.1Nicolas Lœuillet2016-09-011-10/+10
|\ \ \ \ | | | | | | | | | | Update messages.pl.yml
| * | | | Update messages.pl.ymlMateusz Rumiński2016-09-011-10/+10
|/ / / / | | | | | | | | add missing polish translations
* | | | Merge pull request #2255 from wallabag/readabilityJeremy Benoist2016-09-0124-17/+716
|\ \ \ \ | |_|/ / |/| | | Add Readability import
| * | | Added documentation for Readability migrationNicolas Lœuillet2016-09-012-9/+32
| | | |
| * | | Add Readability to Quickstart pageJeremy Benoist2016-09-0112-0/+12
| | | |
| * | | Add tests on ReadabilityImportJeremy Benoist2016-09-014-2/+297
| | | |
| * | | Add missing translationsJeremy Benoist2016-09-0111-8/+49
| | | |
| * | | Fix import count testsJeremy Benoist2016-09-011-1/+1
| | | |
| * | | Add Readability importJeremy Benoist2016-09-016-0/+328
|/ / / | | | | | | | | | Based on the JSON export instead of the API (which will be shutting down by the September 30, 2016)
* | | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-2813-6/+192
|\ \ \
| * | | Occitan versionQuent-in2016-08-271-0/+11
| | | | | | | | | | | | | | | | Occitan translation, I hope I properly put it where it has to be. If there reminds other textes to translate, please let me know!
| * | | Merge pull request #2241 from modos189/v2-issue-1991Jeremy Benoist2016-08-261-0/+4
| |\ \ \ | | | | | | | | | | Fix issue #1991: correction of the height field to add articles
| | * | | Fix issue #1991: correction of the height field to add articlesAlexandr Danilov2016-08-261-0/+4
| |/ / /
| * | | Merge pull request #2238 from modos189/v2-improve-viewThomas Citharel2016-08-255-18/+83
| |\ \ \ | | | | | | | | | | V2 improve view
| | * | | A new version of the plugin tinydot with update on window resizeAlexandr Danilov2016-08-253-17/+81
| | | | |
| | * | | Changes in the login form:Alexandr Danilov2016-08-252-1/+2
| |/ / / | | | | | | | | | | | | | | | | * The alignment of the login form centered in WebKit * Indent after the reference password recovery
| * | | Merge pull request #2236 from wallabag/allow-failure-php-7.1Jeremy Benoist2016-08-241-0/+1
| |\ \ \ | | | | | | | | | | Allow failure for PHP 7.1
| | * | | Allow failure for PHP 7.1Jeremy Benoist2016-08-241-0/+1
| |/ / / | | | | | | | | Got tired of `EE/home/travis/build.sh: line 45: 4445 Segmentation fault (core dumped) phpunit -v` using PHP 7.1.0beta3
| * | | Merge pull request #2234 from cstuder/patch-1Nicolas Lœuillet2016-08-243-3/+3
| |\ \ \ | | | | | | | | | | Fixes mailto link in documentation
| | * | | Fixes mailto link in german translationChristian Studer2016-08-241-1/+1
| | | | |
| | * | | Fixes mailto link in french translationChristian Studer2016-08-241-1/+1
| | | | |
| | * | | Fixes mailto linkChristian Studer2016-08-241-1/+1
| | | | |
| * | | | Merge pull request #2235 from wallabag/german-doc-configNicolas Lœuillet2016-08-242-0/+57
| |\ \ \ \ | | |/ / / | |/| | | Add configuration for german documentation
| | * | | Add configuration for german documentationNicolas Lœuillet2016-08-242-0/+57
| |/ / /
| * | | Merge pull request #2230 from modos189/issue_2055Nicolas Lœuillet2016-08-235-1/+48
| |\ \ \ | | | | | | | | | | Cut entries title in card view: continued
| | * | | Replacement plugin dotdotdot (6.7 KB) on my tinydot (315 bytes)Alexandr Danilov2016-08-235-773/+41
| | | | |
| | * | | Simplify the initialization of the plugin dotdotdotAlexandr Danilov2016-08-222-2/+1
| | | | |
| | * | | Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that ↵Alexandr Danilov2016-08-225-0/+780
| | | | | | | | | | | | | | | | | | | | allows you to clip a text on the second line and fixed cut entries title in card view
| | * | | Don't cut entries title in card viewBaptiste Mille-Mathias2016-05-211-1/+1
| | | | | | | | | | | | | | | | | | | | Stop cutting titles arbitrary at caracter 42.
| * | | | Update SymfonyRequirementsJeremy Benoist2016-08-231-3/+10
| | | | |
* | | | | Merge pull request #2243 from wallabag/feature-untagged-entriesJeremy Benoist2016-08-2818-1/+78
|\ \ \ \ \ | | | | | | | | | | | | Add untagged entries