]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #2002 from wallabag/feature-display-itemsNumber
authorJeremy Benoist <j0k3r@users.noreply.github.com>
Sat, 3 Sep 2016 14:13:08 +0000 (16:13 +0200)
committerGitHub <noreply@github.com>
Sat, 3 Sep 2016 14:13:08 +0000 (16:13 +0200)
Feature display items number

1  2 
app/Resources/static/themes/material/css/main.css
app/config/config.yml
src/Wallabag/CoreBundle/Repository/EntryRepository.php
src/Wallabag/CoreBundle/Resources/config/services.yml

index 30fd60636376415c91c0da22cfa638090cf2ac8e,eb53fc5d45b5a819a08aa857c4f6237b6f5ce58d..31bd8a8c0597a96cc533a7e7a27ccc402504694a
@@@ -49,10 -49,8 +49,11 @@@ wallabag_core
      language: en
      rss_limit: 50
      reading_speed: 1
+     cache_lifetime: 10
  
 +wallabag_user:
 +    registration_enabled: "%fosuser_registration%"
 +
  wallabag_import:
      allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain']
      resource_dir: "%kernel.root_dir%/../web/uploads/import"