aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2290 from wallabag/Quent-in-patch-1Jeremy Benoist2016-09-151-1/+1
|\
| * Update messages.oc.ymlQuent-in2016-09-141-1/+1
|/
* Merge pull request #2279 from wallabag/cleanup-travisNicolas Lœuillet2016-09-117-50/+80
|\
| * Clearing entities in the loop fail on PostgresJeremy Benoist2016-09-113-12/+3
| * Fix error on EntityManager clearJeremy Benoist2016-09-115-26/+76
| * Update install.shJeremy Benoist2016-09-111-15/+4
| * Check if asset is enable instead of oppositeJeremy Benoist2016-09-091-9/+9
|/
* Merge pull request #2275 from wallabag/export-datesNicolas Lœuillet2016-09-085-4/+61
|\
| * 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-user JsonResponseJeremy Benoist2016-09-081-40/+27
|/
* Merge pull request #2266 from wallabag/add-tags-counterJeremy Benoist2016-09-058-41/+63
|\
| * 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 updatedQuent-in2016-09-051-14/+14
|/
* Merge pull request #2263 from wallabag/speed-up-countJeremy Benoist2016-09-043-26/+51
|\
| * CSJeremy Benoist2016-09-031-3/+3
| * Remove Twig globalsJeremy Benoist2016-09-032-23/+48
| * Instead of selecting the whole data, just count itJeremy Benoist2016-09-032-13/+13
|/
* Merge pull request #2002 from wallabag/feature-display-itemsNumberJeremy Benoist2016-09-0310-5/+95
|\
| * 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 screenNicolas Lœuillet2016-09-022-0/+6
|/ /
* | Merge pull request #2252 from wallabag/fix-last-mergeNicolas Lœuillet2016-09-026-108/+4
|\ \
| * | 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
|\ \ \
| * | | 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.ymlMateusz Rumiński2016-09-011-10/+10
|/ / / /
* | | | Merge pull request #2255 from wallabag/readabilityJeremy Benoist2016-09-0124-17/+716
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|/ / /
* | | Merge remote-tracking branch 'origin/master' into 2.1Jeremy Benoist2016-08-2813-6/+192
|\ \ \
| * | | Occitan versionQuent-in2016-08-271-0/+11
| * | | Merge pull request #2241 from modos189/v2-issue-1991Jeremy Benoist2016-08-261-0/+4
| |\ \ \
| | * | | 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
| |\ \ \