1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-06 03:50:04 +02:00

Updated almost all dependencies.

Socket.io' has-binary PR finally got merged so updating to the latest version.
This commit is contained in:
Gunther Brunner 2015-02-24 18:59:56 +09:00
parent 21b4ebe9e4
commit 5c5bd7a822
6 changed files with 31 additions and 29 deletions

View file

@ -2,60 +2,60 @@
"name": "stf", "name": "stf",
"version": "0.1.0", "version": "0.1.0",
"dependencies": { "dependencies": {
"angular": "1.4.0-build.3803", "angular": "1.4.0-build.3855",
"angular-cookies": "1.4.0-build.3803", "angular-cookies": "1.4.0-build.3855",
"angular-route": "1.4.0-build.3803", "angular-route": "1.4.0-build.3855",
"angular-sanitize": "1.4.0-build.3803", "angular-sanitize": "1.4.0-build.3855",
"angular-animate": "1.4.0-build.3803", "angular-animate": "1.4.0-build.3855",
"angular-touch": "1.4.0-build.3803", "angular-touch": "1.4.0-build.3855",
"se7en-bootstrap-3": "~0.2.1", "se7en-bootstrap-3": "~0.2.1",
"lodash": "~3.0.0", "lodash": "~3.0.0",
"oboe": "~2.1.0", "oboe": "~2.1.1",
"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.8", "jquery.terminal": "~0.8.8",
"stf-site": "~0.4.1", "stf-site": "~0.4.1",
"stf-analytics": "~0.2.3", "stf-analytics": "~0.2.3",
"angular-gettext": "git://github.com/rubenv/angular-gettext.git#6bf6a66d8b4fd6c5e0fddcee050991391977cf87", "angular-gettext": "git://github.com/rubenv/angular-gettext.git#6bf6a66d8b4fd6c5e0fddcee050991391977cf87",
"angular-ui-ace": "~0.2.1", "angular-ui-ace": "~0.2.3",
"ui-bootstrap-alerts": "~0.1.5", "ui-bootstrap-alerts": "~0.1.5",
"requirejs": "~2.1.15", "requirejs": "~2.1.16",
"stf-graphics": "~0.1.1", "stf-graphics": "~0.1.1",
"angular-bootstrap": "~0.12.0", "angular-bootstrap": "~0.12.1",
"angular-dialog-service": "~5.2.6", "angular-dialog-service": "~5.2.6",
"ng-file-upload": "~2.0.5", "ng-file-upload": "~2.0.5",
"angular-growl-v2": "JanStevens/angular-growl-2#~0.7.3", "angular-growl-v2": "JanStevens/angular-growl-2#~0.7.3",
"angular-tree-control": "~0.2.7", "angular-tree-control": "~0.2.8",
"angular-loading-bar": "~0.6.0", "angular-loading-bar": "~0.6.0",
"underscore.string": "~3.0.2", "underscore.string": "~3.0.3",
"bootstrap": "~3.3.2", "bootstrap": "~3.3.2",
"font-lato-2-subset": "~0.4.0", "font-lato-2-subset": "~0.4.0",
"packery": "~1.3.2", "packery": "~1.3.2",
"draggabilly": "~1.1.1", "draggabilly": "~1.1.2",
"angular-elastic": "~2.4.2", "angular-elastic": "~2.4.2",
"quick-ng-repeat": "~0.0.1", "quick-ng-repeat": "~0.0.1",
"angular-vs-repeat": "~1.0.0-rc5", "angular-vs-repeat": "~1.0.0-rc5",
"checklist-model": "~0.1.3", "checklist-model": "~0.1.4",
"angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.5", "angular-hotkeys": "chieffancypants/angular-hotkeys#~1.4.5",
"angular-borderlayout": "https://github.com/filearts/angular-borderlayout.git#7c9716aebd9260763f798561ca49d6fbfd4a5c67", "angular-borderlayout": "https://github.com/filearts/angular-borderlayout.git#7c9716aebd9260763f798561ca49d6fbfd4a5c67",
"angular-ui-bootstrap": "~0.12.0", "angular-ui-bootstrap": "~0.12.1",
"angular-ladda": "~0.2.1",
"ng-context-menu": "~1.0.1", "ng-context-menu": "~1.0.1",
"stats.js": "*", "stats.js": "*",
"components-font-awesome": "~4.2.0", "components-font-awesome": "~4.3.0",
"epoch": "~0.6.0", "epoch": "~0.6.0",
"d3": "~3.5.3", "d3": "~3.5.3",
"ng-epoch": "~1.0.7", "ng-epoch": "~1.0.7",
"eventEmitter": "~4.2.11" "eventEmitter": "~4.2.11",
"angular-ladda": "~0.2.2"
}, },
"private": true, "private": true,
"resolutions": { "resolutions": {
"angular": "1.4.0-build.3803", "angular": "1.4.0-build.3855",
"angular-sanitize": "1.4.0-build.3803", "angular-sanitize": "1.4.0-build.3855",
"d3": "~3.5.2", "d3": "~3.5.5",
"angular-bootstrap": "~0.12.0" "angular-bootstrap": "~0.12.1"
}, },
"devDependencies": { "devDependencies": {
"angular-mocks": "1.4.0-build.3803" "angular-mocks": "1.4.0-build.3855"
} }
} }

View file

@ -33,7 +33,7 @@ module.exports = syrup.serial()
) )
plugin.publicPort = options.ports.pop() plugin.publicPort = options.ports.pop()
plugin.publicUrl = _.template(options.screenWsUrlPattern, { plugin.publicUrl = _.template(options.screenWsUrlPattern)({
publicIp: options.publicIp publicIp: options.publicIp
, publicPort: plugin.publicPort , publicPort: plugin.publicPort
, privatePort: plugin.privatePort , privatePort: plugin.privatePort

View file

@ -1,5 +1,4 @@
var syrup = require('stf-syrup') var syrup = require('stf-syrup')
var _ = require('lodash')
var logger = require('../../../util/logger') var logger = require('../../../util/logger')

View file

@ -1,8 +1,8 @@
require('ladda/dist/ladda-themeless.min.css')
window.Ladda = require('ladda/js/ladda') //window.Ladda = require('ladda/js/ladda')
require('angular-ladda/src/angular-ladda') require('angular-ladda/src/angular-ladda')
module.exports = { module.exports = {
Ladda: window.Ladda, //Ladda: window.Ladda,
name: 'angular-ladda' name: 'angular-ladda'
} }

View file

@ -0,0 +1,3 @@
require('ladda/dist/ladda-themeless.min.css')
require('ladda/dist/spin.min.js')
require('ladda/dist/ladda.min.js')

View file

@ -4,6 +4,6 @@ require('se7en-bootstrap-3/build/stylesheets/bootstrap.min.css')
require('se7en-bootstrap-3/build/stylesheets/se7en-font.css') require('se7en-bootstrap-3/build/stylesheets/se7en-font.css')
require('se7en-bootstrap-3/build/stylesheets/style.css') require('se7en-bootstrap-3/build/stylesheets/style.css')
require('components-font-awesome') require('components-font-awesome/css/font-awesome.css')
require('font-lato-2-subset') require('font-lato-2-subset')