Merge pull request #4845 from oliverguenther/housekeeping/angular-dragula

Add angular-dragula bridge
pull/4847/head
Oliver Günther 8 years ago committed by GitHub
commit b5ebfa71a6
  1. 2
      frontend/app/angular-modules.ts
  2. 1
      frontend/app/global.js
  3. 3
      frontend/bower.json
  4. 2569
      frontend/npm-shrinkwrap.json
  5. 1
      frontend/package.json

@ -160,6 +160,7 @@ export const wpButtonsModule = angular.module('openproject.wpButtons',
['ui.router', 'openproject.services']);
// main app
var angularDragula:any = require('angular-dragula');
export const openprojectModule = angular.module('openproject', [
'ui.router',
'openproject.animations',
@ -174,6 +175,7 @@ export const openprojectModule = angular.module('openproject', [
'foundation.modal',
'ngAria',
'ngSanitize',
angularDragula(angular),
'ngDialog',
'truncate',
'openproject.layout',

@ -43,6 +43,7 @@ require('jquery-ui/ui/i18n/jquery.ui.datepicker-de.js');
require('./misc/datepicker-defaults');
require('dragula');
require('angular-dragula');
require('jquery-ui/themes/base/jquery.ui.core.css');
require('jquery-ui/themes/base/jquery.ui.datepicker.css');

@ -29,7 +29,8 @@
"mousetrap": "~1.4.6",
"ng-file-upload": "~5.0.9",
"rxjs": "^4.1.0",
"ng-dialog": "^0.6.2"
"ng-dialog": "^0.6.2",
"angular-dragula": "^1.2.7"
},
"devDependencies": {
"mocha": "~1.14.0",

File diff suppressed because it is too large Load Diff

@ -29,6 +29,7 @@
"dependencies": {
"URIjs": "^1.14.1",
"angular-elastic": "^2.5.0",
"atoa": "^1.0.0",
"autoprefixer-loader": "^1.2.0",
"bower": "^1.4.1",
"css-loader": "^0.9.0",

Loading…
Cancel
Save