yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 19:42:01 +02:00
Code Issues Releases Wiki Activity

Updated bower dependencies.

Browse source 
Added default hotkeys title.
This commit is contained in:
Gunther Brunner 2014-08-18 20:04:42 +09:00
parent 74c30a70b9
commit 0753ac4730
2 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

18
bower.json
View file

@ -2,11 +2,11 @@
"name": "stf",
"version": "0.1.0",
"dependencies": {
"angular": "~1.3.0-beta.17",
"angular-route": "~1.3.0-beta.17",
"angular-sanitize": "~1.3.0-beta.17",
"angular-animate": "~1.3.0-beta.17",
"angular-touch": "~1.3.0-beta.17",
"angular": "~1.3.0-beta.18",
"angular-route": "~1.3.0-beta.18",
"angular-sanitize": "~1.3.0-beta.18",
"angular-animate": "~1.3.0-beta.18",
"angular-touch": "~1.3.0-beta.18",
"se7en-bootstrap-3": "~0.2.1",
"lodash": "~2.4.1",
"oboe": "~1.15.1",
@ -23,7 +23,7 @@
"angular-bootstrap": "~0.11.0",
"angular-dialog-service": "~5.1.1",
"ng-file-upload": "~1.6.5",
"angular-growl-v2": "JanStevens/angular-growl-2#~0.6.1",
"angular-growl-v2": "JanStevens/angular-growl-2#~0.7.0",
"bluebird": "~2.1.3",
"angular-tree-control": "~0.2.2",
"angular-loading-bar": "~0.5.0",
@ -37,15 +37,15 @@
"quick-ng-repeat": "~0.0.1",
"angular-vs-repeat": "~1.0.0-rc5",
"checklist-model": "~0.1.3",
"angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.2",
"angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.3",
"angular-borderlayout": "https://github.com/filearts/angular-borderlayout.git",
"angular-ui-bootstrap": "~0.11.0",
"angular-ladda": "~0.1.6"
},
"private": true,
"resolutions": {
"angular": "~1.3.0-beta.17",
"angular-sanitize": "~1.3.0-beta.17",
"angular": "~1.3.0-beta.18",
"angular-sanitize": "~1.3.0-beta.18",
"bootstrap": "~3.2.0"
}
}

23
res/app/app.js
View file

@ -20,17 +20,18 @@ require.ensure([], function (require) {
require('./menu').name,
require('./settings').name,
require('./help').name,
require('./../common/lang').name,
require('./../test/samples/vs-repeat').name
require('./../common/lang').name
])
.config(['$routeProvider', '$locationProvider',
function ($routeProvider, $locationProvider) {
$locationProvider.hashPrefix('!');
$routeProvider
.otherwise({
redirectTo: '/devices'
})
}
])
.config(function ($routeProvider, $locationProvider) {
$locationProvider.hashPrefix('!');
$routeProvider
.otherwise({
redirectTo: '/devices'
})
}
)
.config(function (hotkeysProvider) {
hotkeysProvider.templateTitle = 'Keyboard Shortcuts:'
})
})