From: Thomas Citharel <tcit@tcit.fr>
Date: Tue, 9 May 2017 09:43:48 +0000 (+0200)
Subject: Merge pull request #3022 from wallabag/webpack
X-Git-Tag: 2.3.0~31^2~104
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b28c5430efefa63d04d87404c99798e82d0427e4;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #3022 from wallabag/webpack

Adds Webpack support and remove Grunt
---

b28c5430efefa63d04d87404c99798e82d0427e4
diff --combined app/config/config.yml
index 451809d6,c076aea9..116bb04c
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@@ -3,6 -3,10 +3,10 @@@ imports
      - { resource: security.yml }
      - { resource: services.yml }
  
+ parameters:
+     # Allows to use the live reload feature for changes in assets
+     use_webpack_dev_server: false
+ 
  framework:
      #esi:             ~
      translator:
@@@ -55,7 -59,6 +59,7 @@@ wallabag_core
      list_mode: 0
      fetching_error_message: |
          wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
 +    api_limit_mass_actions: 10
  
  wallabag_user:
      registration_enabled: "%fosuser_registration%"