BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix bower.json with compatibles packages versions of angularjs

This commit is contained in:
Gustavo Maximiliano Cortez 2014-11-25 15:08:40 -03:00
parent da5cea61cd
commit d1979f443a
3 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Gruntfile.js
View File

@ -74,7 +74,6 @@ module.exports = function(grunt) {
'js/directives.js', 'js/directives.js',
'js/filters.js', 'js/filters.js',
'js/routes.js', 'js/routes.js',
'js/mobile.js',
'js/services/*.js', 'js/services/*.js',
'js/controllers/*.js' 'js/controllers/*.js'
], ],
@ -114,7 +113,6 @@ module.exports = function(grunt) {
concat: { concat: {
vendors: { vendors: {
src: [ src: [
'lib/mousetrap/mousetrap.min.js',
'lib/moment/min/moment.min.js', 'lib/moment/min/moment.min.js',
'lib/qrcode-generator/js/qrcode.js', 'lib/qrcode-generator/js/qrcode.js',
'lib/lodash/dist/lodash.js', 'lib/lodash/dist/lodash.js',
@ -122,7 +120,6 @@ module.exports = function(grunt) {
'lib/file-saver/FileSaver.js', 'lib/file-saver/FileSaver.js',
'lib/socket.io-client/socket.io.js', 'lib/socket.io-client/socket.io.js',
'lib/sjcl.js', 'lib/sjcl.js',
'lib/ios-imagefile-megapixel/megapix-image.js',
'lib/qrcode-decoder-js/lib/qrcode-decoder.min.js' 'lib/qrcode-decoder-js/lib/qrcode-decoder.min.js'
], ],
dest: 'lib/vendors.js' dest: 'lib/vendors.js'
@ -154,7 +151,6 @@ module.exports = function(grunt) {
'js/services/*.js', 'js/services/*.js',
'js/controllers/*.js', 'js/controllers/*.js',
'js/translations.js', 'js/translations.js',
'js/mobile.js', // PLACEHOLDER: CORDOVA SRIPT
'js/init.js', 'js/init.js',
], ],
dest: 'js/copayMain.js' dest: 'js/copayMain.js'

7
bower.json
View File

@ -6,7 +6,7 @@
"multisignature" "multisignature"
], ],
"dependencies": { "dependencies": {
"angular": "=1.2.19", "angular": "~1.2.27",
"angular-foundation": "*", "angular-foundation": "*",
"angular-route": "~1.2.14", "angular-route": "~1.2.14",
"angular-qrcode": "~3.1.0", "angular-qrcode": "~3.1.0",
@ -19,15 +19,14 @@
"qrcode-decoder-js": "*", "qrcode-decoder-js": "*",
"angular-moment": "~0.7.1", "angular-moment": "~0.7.1",
"socket.io-client": ">=1.0.0", "socket.io-client": ">=1.0.0",
"mousetrap": "1.4.6",
"ng-idle": "*", "ng-idle": "*",
"inherits": "~0.0.1", "inherits": "~0.0.1",
"angular-load": "0.2.0", "angular-load": "0.2.0",
"lodash": "~2.4.1", "lodash": "~2.4.1",
"angular-gravatar": "*", "angular-gravatar": "*",
"angular-touch": "~1.3.3" "angular-touch": "~1.2.27"
}, },
"resolutions": { "resolutions": {
"angular": "=1.2.19" "angular": "~1.2.0"
} }
} }

1
package.json
View File

@ -85,7 +85,6 @@
"mock-fs": "^2.3.1", "mock-fs": "^2.3.1",
"node-cryptojs-aes": "^0.4.0", "node-cryptojs-aes": "^0.4.0",
"request": "^2.40.0", "request": "^2.40.0",
"shelljs": "^0.3.0",
"sinon": "^1.10.3", "sinon": "^1.10.3",
"sjcl": "*", "sjcl": "*",
"socket.io-client": "^1.0.6", "socket.io-client": "^1.0.6",