starred/stf
1
0
Fork 0
mirror of https://github.com/DeviceFarmer/stf.git synced 2026-04-20 15:55:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updated sensible bower dependencies.

Browse Source 
Updated ng-file-upload to the latest version.
This commit is contained in:
Gunther Brunner
2014-07-24 20:17:49 +09:00
parent 6c8b6bb5d4
commit a332b6a5bb
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bower.json
View File

@@ -2,18 +2,17 @@
"name": "stf", "name": "stf",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"angular": "~1.3.0-beta.13", "angular": "~1.3.0-beta.16",
"angular-route": "~1.3.0-beta.13", "angular-route": "~1.3.0-beta.16",
"angular-sanitize": "~1.3.0-beta.13", "angular-sanitize": "~1.3.0-beta.16",
"angular-animate": "~1.3.0-beta.13", "angular-animate": "~1.3.0-beta.16",
"angular-touch": "~1.3.0-beta.13", "angular-touch": "~1.3.0-beta.16",
"se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git#46b7dd0792cfdc66bf01e351cd680de88740d60c", "se7en-bootstrap-3": "git@ghe.amb.ca.local:stf/se7en-bootstrap-3.git#46b7dd0792cfdc66bf01e351cd680de88740d60c",
"lodash": "~2.4.1", "lodash": "~2.4.1",
"oboe": "~1.15.1", "oboe": "~1.15.1",
"fa-borderlayout": "~0.3.1-beta2",
"Snap.svg": "~0.3.0", "Snap.svg": "~0.3.0",
"ng-table": "git://github.com/esvit/ng-table.git#bd9ec42172389257fcd312330013302b2696ac2a", "ng-table": "git://github.com/esvit/ng-table.git#bd9ec42172389257fcd312330013302b2696ac2a",
"jquery.terminal": "~0.8.7", "jquery.terminal": "~0.8.8",
"stf-site": "~0.4.1", "stf-site": "~0.4.1",
"stf-analytics": "~0.2.2", "stf-analytics": "~0.2.2",
"angular-gettext": "~0.4.0", "angular-gettext": "~0.4.0",
@@ -23,11 +22,11 @@
"stf-graphics": "~0.1.1", "stf-graphics": "~0.1.1",
"angular-bootstrap": "~0.11.0", "angular-bootstrap": "~0.11.0",
"angular-dialog-service": "~5.0.0", "angular-dialog-service": "~5.0.0",
"ng-file-upload": "~1.4.0", "ng-file-upload": "~1.6.1",
"angular-growl-v2": "JanStevens/angular-growl-2#~0.6.1", "angular-growl-v2": "JanStevens/angular-growl-2#~0.6.1",
"bluebird": "~2.1.3", "bluebird": "~2.1.3",
"angular-tree-control": "~0.2.2", "angular-tree-control": "~0.2.2",
"angular-loading-bar": "~0.4.3", "angular-loading-bar": "~0.5.0",
"underscore.string": "~2.3.3", "underscore.string": "~2.3.3",
"font-awesome-bower": "~4.1.0", "font-awesome-bower": "~4.1.0",
"bootstrap": "~3.2.0", "bootstrap": "~3.2.0",
@@ -39,12 +38,13 @@
"angular-vs-repeat": "~1.0.0-rc3", "angular-vs-repeat": "~1.0.0-rc3",
"checklist-model": "~0.1.3", "checklist-model": "~0.1.3",
"angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.0", "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.0",
"angular-borderlayout": "https://github.com/filearts/angular-borderlayout.git" "angular-borderlayout": "https://github.com/filearts/angular-borderlayout.git",
"angular-ui-bootstrap": "~0.11.0"
}, },
"private": true, "private": true,
"resolutions": { "resolutions": {
"angular": "~1.3.0-beta.13", "angular": "~1.3.0-beta.16",
"angular-sanitize": "~1.3.0-beta.13", "angular-sanitize": "~1.3.0-beta.16",
"bootstrap": "~3.2.0" "bootstrap": "~3.2.0"
} }
} }

3
res/app/control-panes/dashboard/upload/upload-controller.js
View File

@@ -68,7 +68,8 @@ module.exports = function UploadCtrl(
} }
}) })
var href = res.data.resources.file0.href var href = res.data.resources.file.href
return $http.get(href + '/manifest') return $http.get(href + '/manifest')
.then(function(res) { .then(function(res) {
$scope.upload = { $scope.upload = {