Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"devDependencies": {
"@symfony/webpack-encore": "^0.7.1",
"@symfony/webpack-encore": "^0.9.1",
"bloodhound-js": "^1.2.1",
"bootstrap-sass": "^3.3.7",
"bootstrap-tagsinput": "^0.7.1",
Expand Down
758 changes: 379 additions & 379 deletions web/build/js/admin.js

Large diffs are not rendered by default.

34 changes: 17 additions & 17 deletions web/build/js/app.js

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions web/build/js/common.js

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions web/build/js/login.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
webpackJsonp([5],{136:/*!******************************************!*\
!*** ./app/Resources/assets/js/login.js ***!
\******************************************/
function(a,n,l){(function(a){a(function(){var n=a("#username"),l=a("#password");n.val()||l.val()||(n.val("jane_admin"),l.val("kitten"))})}).call(n,l(/*! jquery */1))}},[136]);
webpackJsonp([5],{nxx7:/*!****************************!*\
!*** ./assets/js/login.js ***!
\****************************/
function(n,a,l){(function(n){n(function(){var a=n("#username"),l=n("#password");a.val()||l.val()||(a.val("jane_admin"),l.val("kitten"))})}).call(a,l(/*! jquery */"7t+N"))}},["nxx7"]);
10 changes: 5 additions & 5 deletions webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ Encore
.enableSassLoader()
.enableVersioning(false)
.createSharedEntry('js/common', ['jquery'])
.addEntry('js/app', './app/Resources/assets/js/app.js')
.addEntry('js/login', './app/Resources/assets/js/login.js')
.addEntry('js/admin', './app/Resources/assets/js/admin.js')
.addStyleEntry('css/app', ['./app/Resources/assets/scss/app.scss'])
.addStyleEntry('css/admin', ['./app/Resources/assets/scss/admin.scss'])
.addEntry('js/app', './assets/js/app.js')
.addEntry('js/login', './assets/js/login.js')
.addEntry('js/admin', './assets/js/admin.js')
.addStyleEntry('css/app', ['./assets/scss/app.scss'])
.addStyleEntry('css/admin', ['./assets/scss/admin.scss'])
;

module.exports = Encore.getWebpackConfig();
Loading