aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2279 from wallabag/cleanup-travisNicolas Lœuillet2016-09-117-50/+80
|\ | | | | Check if asset is enable instead of opposite
| * Clearing entities in the loop fail on PostgresJeremy Benoist2016-09-113-12/+3
| | | | | | | | It looks like when you clear entities on Postgres some references are lost and tags are not saved :-/
| * Fix error on EntityManager clearJeremy Benoist2016-09-115-26/+76
| | | | | | | | | | Introduced in the recent 2.5.5 release. Also updated deps.
| * Update install.shJeremy Benoist2016-09-111-15/+4
| | | | | | | | Since $ASSETS can be empty now and only be “build”.
| * Check if asset is enable instead of oppositeJeremy Benoist2016-09-091-9/+9
|/ | | | | | Instead of defining ASSETS all the time, just define it when we want to use it Might give us more clearer build
* Merge pull request #2275 from wallabag/export-datesNicolas Lœuillet2016-09-085-4/+61
|\ | | | | Export dates from entries
| * Export dates from entriesJeremy Benoist2016-09-085-4/+61
| |
* | Merge pull request #2274 from wallabag/json-response-created-atNicolas Lœuillet2016-09-081-40/+27
|\ \ | |/ |/| Re-use JsonResponse
| * Re-user JsonResponseJeremy Benoist2016-09-081-40/+27
|/ | | | Since Symfony 3.1 we can define the json of a JsonResonse using `->setJson()`
* Merge pull request #2266 from wallabag/add-tags-counterJeremy Benoist2016-09-058-41/+63
|\ | | | | Added tags counter in sidebar (material theme)
| * Returned 0 instead of returning empty array for Twig ExtensionNicolas Lœuillet2016-09-051-2/+2
| |
| * Remove useless variableNicolas Lœuillet2016-09-051-2/+0
| |
| * Switched enableCache visibility to privateNicolas Lœuillet2016-09-041-1/+1
| |
| * Added tags counter in sidebar (material theme)Nicolas Lœuillet2016-09-048-38/+62
| |
* | Merge pull request #2267 from wallabag/Quent-in-patch-1Jeremy Benoist2016-09-051-14/+14
|\ \ | |/ |/| Occitan updated
| * Occitan updatedQuent-in2016-09-051-14/+14
|/ | | | | Line 347, I'm not sure about what I wrote to avoid and end of string started with " I had to use the simple ' in the sentence. Let me know if it was okay like so.
* 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-06 12:06:05 +0000