diff --git a/bower.json b/bower.json index 6ac652cf..32f40550 100644 --- a/bower.json +++ b/bower.json @@ -9,7 +9,7 @@ "angular-touch": "1.3.0-beta.19", "se7en-bootstrap-3": "~0.2.1", "lodash": "~2.4.1", - "oboe": "~1.15.2", + "oboe": "~2.0.2", "Snap.svg": "~0.3.0", "ng-table": "git://github.com/esvit/ng-table.git#bd9ec42172389257fcd312330013302b2696ac2a", "jquery.terminal": "~0.8.8", @@ -20,7 +20,7 @@ "ui-bootstrap-alerts": "~0.1.5", "requirejs": "~2.1.15", "stf-graphics": "~0.1.1", - "angular-bootstrap": "~0.11.0", + "angular-bootstrap": "~0.11.2", "angular-dialog-service": "~5.2.1", "ng-file-upload": "~1.6.12", "angular-growl-v2": "JanStevens/angular-growl-2#~0.7.0", diff --git a/webpack.config.js b/webpack.config.js index f06f687b..e193609b 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -29,8 +29,7 @@ module.exports = { alias: { 'angular-bootstrap': 'angular-bootstrap/ui-bootstrap-tpls', 'localforage': 'localforage/dist/localforage.js', - 'socket.io': 'socket.io-client', - 'oboe': 'oboe/dist/oboe-browser' + 'socket.io': 'socket.io-client' } }, module: { @@ -53,9 +52,7 @@ module.exports = { { test: /angular-touch\.js$/, loader: 'imports?angular=angular'}, { test: /angular-animate\.js$/, loader: 'imports?angular=angular'}, { test: /angular-growl\.js$/, loader: 'imports?angular=angular'}, - { test: /oboe-browser\.js$/, loader: 'imports?define=>false!exports?oboe'}, { test: /uuid\.js$/, loader: 'imports?require=>undefined'}, - //{ test: /ui-bootstrap-tpls\.js$/, loader: 'script'}, { test: /dialogs\.js$/, loader: 'script'} ], preLoaders: [