Skip to content

Commit

Permalink
Merge pull request #422 from lewisl9029/dev-upgrade-remotestorage-to-…
Browse files Browse the repository at this point in the history 
…0.12.0

Dev upgrade remotestorage to 0 12 0. Closes #422
  • Loading branch information
@lewisl9029
lewisl9029 committed Oct 11, 2015
2 parents 44a4f33 + 1f391b6 commit 3a20f60
Show file tree
Hide file tree
Showing 7 changed files with 51 additions and 13,399 deletions.
23 changes: 9 additions & 14 deletions package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "toc-im",
"version": "0.9.0-alpha",
"version": "0.10.0-alpha",
"description": "Toc Messenger",
"license": "AGPL-3.0",
"repository": {
Expand Down Expand Up @@ -52,7 +52,7 @@
"plugin-text": "github:systemjs/plugin-text@^0.0.2",
"qr-image": "npm:qr-image@^3.1.0",
"ramda": "npm:ramda@^0.17.1",
"remotestoragejs": "npm:remotestoragejs@^0.11.2",
"remotestoragejs": "npm:remotestoragejs@^0.12.0",
"text": "github:systemjs/plugin-text@^0.0.2"
},
"devDependencies": {
Expand All @@ -61,6 +61,12 @@
"core-js": "npm:core-js@^1.1.4"
},
"overrides": {
"npm:remotestoragejs@0.12.0": {
"registry": "jspm",
"main": "release/0.12.0/remotestorage",
"format": "global",
"dependencies": {}
},
"github:driftyco/ionic@1.1.0": {
"registry": "jspm",
"format": "global",
Expand All @@ -86,12 +92,6 @@
"angular-ui-router": "^0.2.10"
}
},
"npm:remotestoragejs@0.11.2": {
"registry": "jspm",
"main": "release/0.11.2/remotestorage",
"format": "global",
"dependencies": {}
},
"github:angular-ui/ui-router@0.2.15": {
"shim": {
"angular-ui-router": [
Expand Down Expand Up @@ -128,12 +128,7 @@
{
"locator": "https://github.com/phonegap/phonegap-plugin-barcodescanner.git",
"id": "phonegap-plugin-barcodescanner"
},
{
"locator": "https://github.com/katzer/cordova-plugin-background-mode.git",
"id": "de.appplant.cordova.plugin.background-mode"
},
"de.appplant.cordova.plugin.badge"
}
],
"cordovaPlatforms": [
"android",
Expand Down
47 changes: 25 additions & 22 deletions toc/app/jspm-config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ System.config({
"plugin-text": "github:systemjs/plugin-text@0.0.2",
"qr-image": "npm:qr-image@3.1.0",
"ramda": "npm:ramda@0.17.1",
"remotestoragejs": "npm:remotestoragejs@0.11.2",
"remotestoragejs": "npm:remotestoragejs@0.12.0",
"text": "github:systemjs/plugin-text@0.0.2",
"github:angular-ui/ui-router@0.2.15": {
"angular": "github:angular/bower-angular@1.4.6"
Expand All @@ -51,16 +51,16 @@ System.config({
"assert": "npm:assert@1.3.0"
},
"github:jspm/nodelibs-buffer@0.1.0": {
"buffer": "npm:buffer@3.5.0"
"buffer": "npm:buffer@3.5.1"
},
"github:jspm/nodelibs-events@0.1.1": {
"events": "npm:events@1.0.2"
},
"github:jspm/nodelibs-path@0.1.0": {
"path-browserify": "npm:path-browserify@0.0.0"
},
"github:jspm/nodelibs-process@0.1.1": {
"process": "npm:process@0.10.1"
"github:jspm/nodelibs-process@0.1.2": {
"process": "npm:process@0.11.2"
},
"github:jspm/nodelibs-stream@0.1.0": {
"stream-browserify": "npm:stream-browserify@1.0.0"
Expand All @@ -78,7 +78,7 @@ System.config({
"util": "npm:util@0.10.3"
},
"npm:babel-runtime@5.8.24": {
"process": "github:jspm/nodelibs-process@0.1.1"
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:baobab@2.0.0": {
"emmett": "npm:emmett@3.1.1"
Expand All @@ -87,11 +87,11 @@ System.config({
"assert": "github:jspm/nodelibs-assert@0.1.0",
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
"pako": "npm:pako@0.2.8",
"process": "github:jspm/nodelibs-process@0.1.1",
"process": "github:jspm/nodelibs-process@0.1.2",
"readable-stream": "npm:readable-stream@1.1.13",
"util": "github:jspm/nodelibs-util@0.1.0"
},
"npm:buffer@3.5.0": {
"npm:buffer@3.5.1": {
"base64-js": "npm:base64-js@0.0.8",
"ieee754": "npm:ieee754@1.1.6",
"is-array": "npm:is-array@1.0.1"
Expand All @@ -105,7 +105,7 @@ System.config({
},
"npm:core-js@1.1.4": {
"fs": "github:jspm/nodelibs-fs@0.1.2",
"process": "github:jspm/nodelibs-process@0.1.1",
"process": "github:jspm/nodelibs-process@0.1.2",
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
},
"npm:core-util-is@1.0.1": {
Expand All @@ -120,15 +120,15 @@ System.config({
"from": "npm:from@0.1.3",
"map-stream": "npm:map-stream@0.1.0",
"pause-stream": "npm:pause-stream@0.0.11",
"process": "github:jspm/nodelibs-process@0.1.1",
"process": "github:jspm/nodelibs-process@0.1.2",
"split": "npm:split@0.2.10",
"stream": "github:jspm/nodelibs-stream@0.1.0",
"stream-combiner": "npm:stream-combiner@0.0.4",
"through": "npm:through@2.3.8",
"util": "github:jspm/nodelibs-util@0.1.0"
},
"npm:from@0.1.3": {
"process": "github:jspm/nodelibs-process@0.1.1",
"process": "github:jspm/nodelibs-process@0.1.2",
"stream": "github:jspm/nodelibs-stream@0.1.0"
},
"npm:inherits@2.0.1": {
Expand Down Expand Up @@ -191,12 +191,12 @@ System.config({
"lodash._isnative": "npm:lodash._isnative@2.4.1"
},
"npm:map-stream@0.1.0": {
"process": "github:jspm/nodelibs-process@0.1.1",
"process": "github:jspm/nodelibs-process@0.1.2",
"stream": "github:jspm/nodelibs-stream@0.1.0",
"util": "github:jspm/nodelibs-util@0.1.0"
},
"npm:moment@2.10.6": {
"process": "github:jspm/nodelibs-process@0.1.1"
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:ng-cordova@0.1.17-alpha": {
"angular": "github:angular/bower-angular@1.4.6",
Expand All @@ -205,46 +205,49 @@ System.config({
"conventional-changelog": "npm:conventional-changelog@0.0.11",
"fs": "npm:fs@0.0.2",
"path": "github:jspm/nodelibs-path@0.1.0",
"process": "github:jspm/nodelibs-process@0.1.1",
"process": "github:jspm/nodelibs-process@0.1.2",
"q": "npm:q@1.4.1",
"sys": "github:jspm/nodelibs-util@0.1.0",
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
},
"npm:pako@0.2.8": {
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
"process": "github:jspm/nodelibs-process@0.1.1"
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:path-browserify@0.0.0": {
"process": "github:jspm/nodelibs-process@0.1.1"
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:pause-stream@0.0.11": {
"through": "npm:through@2.3.8"
},
"npm:process@0.11.2": {
"assert": "github:jspm/nodelibs-assert@0.1.0"
},
"npm:q@1.4.1": {
"process": "github:jspm/nodelibs-process@0.1.1"
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:qr-image@3.1.0": {
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
"pako": "npm:pako@0.2.8",
"process": "github:jspm/nodelibs-process@0.1.1",
"process": "github:jspm/nodelibs-process@0.1.2",
"stream": "github:jspm/nodelibs-stream@0.1.0",
"zlib": "github:jspm/nodelibs-zlib@0.1.0"
},
"npm:ramda@0.17.1": {
"process": "github:jspm/nodelibs-process@0.1.1"
"process": "github:jspm/nodelibs-process@0.1.2"
},
"npm:readable-stream@1.1.13": {
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
"core-util-is": "npm:core-util-is@1.0.1",
"events": "github:jspm/nodelibs-events@0.1.1",
"inherits": "npm:inherits@2.0.1",
"isarray": "npm:isarray@0.0.1",
"process": "github:jspm/nodelibs-process@0.1.1",
"process": "github:jspm/nodelibs-process@0.1.2",
"stream-browserify": "npm:stream-browserify@1.0.0",
"string_decoder": "npm:string_decoder@0.10.31"
},
"npm:split@0.2.10": {
"process": "github:jspm/nodelibs-process@0.1.1",
"process": "github:jspm/nodelibs-process@0.1.2",
"string_decoder": "github:jspm/nodelibs-string_decoder@0.1.0",
"through": "npm:through@2.3.8",
"util": "github:jspm/nodelibs-util@0.1.0"
Expand All @@ -261,12 +264,12 @@ System.config({
"buffer": "github:jspm/nodelibs-buffer@0.1.0"
},
"npm:through@2.3.8": {
"process": "github:jspm/nodelibs-process@0.1.1",
"process": "github:jspm/nodelibs-process@0.1.2",
"stream": "github:jspm/nodelibs-stream@0.1.0"
},
"npm:util@0.10.3": {
"inherits": "npm:inherits@2.0.1",
"process": "github:jspm/nodelibs-process@0.1.1"
"process": "github:jspm/nodelibs-process@0.1.2"
}
}
});
Loading

0 comments on commit 3a20f60

Please sign in to comment.