IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Moved angular-native-dragdrop to bower

Browse Source
This commit is contained in:
Torkel Ödegaard
2015-06-13 22:16:07 +02:00
parent f22bffe98a
commit 05f934548b
16 changed files with 1081 additions and 386 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/app/components/require.config.js
View File

@@ -1,4 +1,3 @@
require.config({
urlArgs: 'bust=' + (new Date().getTime()),
baseUrl: 'public/app',
@@ -17,7 +16,7 @@ require.config({
angular: '../vendor/angular/angular',
'angular-route': '../vendor/angular-route/angular-route',
'angular-sanitize': '../vendor/angular-sanitize/angular-sanitize',
'angular-dragdrop': '../vendor/angular-other/angular-dragdrop',
'angular-dragdrop': '../vendor/angular-native-dragdrop/draganddrop',
'angular-strap': '../vendor/angular-other/angular-strap',
timepicker: '../vendor/angular-other/timepicker',
datepicker: '../vendor/angular-other/datepicker',
@@ -101,5 +100,4 @@ require.config({
'bootstrap-tagsinput': ['jquery'],
},
waitSeconds: 60,
});