]> git.immae.eu Git - github/wallabag/wallabag.git/commitdiff
Merge pull request #3022 from wallabag/webpack
authorThomas Citharel <tcit@tcit.fr>
Tue, 9 May 2017 09:43:48 +0000 (11:43 +0200)
committerGitHub <noreply@github.com>
Tue, 9 May 2017 09:43:48 +0000 (11:43 +0200)
Adds Webpack support and remove Grunt

1  2 
app/config/config.yml

diff --combined app/config/config.yml
index 451809d640557c86c553d39663702c0fdf229ca3,c076aea968f7095c42ccfa5272bddb9e19dde946..116bb04c15c37f6f0f49c10de7044d1d8de7208f
@@@ -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%"