Skip to content

Commit 82ef93d

Browse files
author
Vitor Silva
committed
merge dev-0.2 with master branch
2 parents b13b5ca + b8da581 commit 82ef93d

File tree

116 files changed

+17400
-2854
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+17400
-2854
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ npm-debug.log
1212
vendor
1313
build
1414
node_modules
15+
resources/bundle.js
1516
*.komodoproject

.jscsrc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
"requirePaddingNewLinesAfterBlocks": false,
7070
"requireSemicolons": true,
7171
"safeContextKeyword": "_this",
72-
"validateLineBreaks": "LF",
7372
"validateQuoteMarks": "'",
7473
"validateIndentation": 2
7574
}

.jshintrc

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
11
{
2-
"esnext": true
2+
"esnext": true,
3+
"boss": true,
4+
"node": true,
5+
"evil": true,
6+
"eqeqeq": true,
7+
"undef": true,
8+
"unused": true,
9+
"onecase": true,
10+
"varstmt": true,
11+
"lastsemic": true,
12+
"phantom": true,
13+
"browserify": true
314
}

config.js

Lines changed: 150 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,22 @@ System.config({
1818
"babel": "npm:babel-core@5.8.34",
1919
"babel-runtime": "npm:babel-runtime@5.8.34",
2020
"babelify": "npm:babelify@6.3.0",
21+
"bip39": "npm:bip39@2.2.0",
22+
"bitcoinjs-lib": "npm:bitcoinjs-lib@2.1.4",
2123
"browserify": "npm:browserify@11.1.0",
2224
"core-js": "npm:core-js@1.2.6",
25+
"deep-eql": "npm:deep-eql@0.1.3",
26+
"handlebars": "github:components/handlebars.js@4.0.5",
27+
"hellojs": "npm:hellojs@1.9.9",
28+
"jsrsasign": "npm:jsrsasign@5.0.5",
2329
"karma-browserify": "npm:karma-browserify@4.3.0",
24-
"mutationobserver-shim": "npm:mutationobserver-shim@0.3.1",
30+
"service-framework": "github:rethink-project/dev-service-framework@develop",
31+
"sjcl": "npm:sjcl@1.0.3",
2532
"github:jspm/nodelibs-assert@0.1.0": {
2633
"assert": "npm:assert@1.3.0"
2734
},
2835
"github:jspm/nodelibs-buffer@0.1.0": {
29-
"buffer": "npm:buffer@3.5.0"
36+
"buffer": "npm:buffer@3.5.5"
3037
},
3138
"github:jspm/nodelibs-constants@0.1.0": {
3239
"constants-browserify": "npm:constants-browserify@0.0.1"
@@ -97,6 +104,15 @@ System.config({
97104
"github:jspm/nodelibs-zlib@0.1.0": {
98105
"browserify-zlib": "npm:browserify-zlib@0.1.4"
99106
},
107+
"github:rethink-project/dev-service-framework@develop": {
108+
"array.observe": "npm:array.observe@0.0.1",
109+
"babel-polyfill": "npm:babel-polyfill@6.3.14",
110+
"indexeddbshim": "npm:indexeddbshim@2.2.1",
111+
"object.observe": "npm:object.observe@0.2.6",
112+
"ortc-over-rtc": "npm:ortc-over-rtc@0.1.0",
113+
"webrtc-adapter-test": "npm:webrtc-adapter-test@0.2.5",
114+
"webrtc-shim": "npm:webrtc-shim@0.1.2"
115+
},
100116
"npm:JSONStream@1.0.4": {
101117
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
102118
"jsonparse": "npm:jsonparse@1.0.0",
@@ -127,6 +143,9 @@ System.config({
127143
"arr-flatten": "npm:arr-flatten@1.0.1",
128144
"array-slice": "npm:array-slice@0.2.3"
129145
},
146+
"npm:array.observe@0.0.1": {
147+
"process": "github:jspm/nodelibs-process@0.1.2"
148+
},
130149
"npm:asn1.js@2.2.1": {
131150
"assert": "github:jspm/nodelibs-assert@0.1.0",
132151
"bn.js": "npm:bn.js@2.2.0",
@@ -144,11 +163,20 @@ System.config({
144163
"npm:async@0.2.10": {
145164
"process": "github:jspm/nodelibs-process@0.1.2"
146165
},
166+
"npm:babel-polyfill@6.3.14": {
167+
"babel-regenerator-runtime": "npm:babel-regenerator-runtime@6.3.13",
168+
"babel-runtime": "npm:babel-runtime@5.8.34",
169+
"core-js": "npm:core-js@1.2.6",
170+
"process": "github:jspm/nodelibs-process@0.1.2"
171+
},
172+
"npm:babel-regenerator-runtime@6.3.13": {
173+
"process": "github:jspm/nodelibs-process@0.1.2"
174+
},
147175
"npm:babel-runtime@5.8.34": {
148176
"process": "github:jspm/nodelibs-process@0.1.2"
149177
},
150178
"npm:babelify@6.3.0": {
151-
"babel-core": "npm:babel-core@5.8.24",
179+
"babel-core": "npm:babel-core@5.8.34",
152180
"object-assign": "npm:object-assign@3.0.0",
153181
"path": "github:jspm/nodelibs-path@0.1.0",
154182
"stream": "github:jspm/nodelibs-stream@0.1.0",
@@ -167,6 +195,11 @@ System.config({
167195
"fs": "github:jspm/nodelibs-fs@0.1.2",
168196
"process": "github:jspm/nodelibs-process@0.1.2"
169197
},
198+
"npm:bigi@1.4.1": {
199+
"assert": "github:jspm/nodelibs-assert@0.1.0",
200+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
201+
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
202+
},
170203
"npm:binary-extensions@1.3.1": {
171204
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
172205
},
@@ -175,6 +208,34 @@ System.config({
175208
"path": "github:jspm/nodelibs-path@0.1.0",
176209
"process": "github:jspm/nodelibs-process@0.1.2"
177210
},
211+
"npm:bip39@2.2.0": {
212+
"assert": "github:jspm/nodelibs-assert@0.1.0",
213+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
214+
"create-hash": "npm:create-hash@1.1.1",
215+
"pbkdf2": "npm:pbkdf2@3.0.4",
216+
"randombytes": "npm:randombytes@2.0.1",
217+
"systemjs-json": "github:systemjs/plugin-json@0.1.0",
218+
"unorm": "npm:unorm@1.4.1"
219+
},
220+
"npm:bip66@1.1.0": {
221+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
222+
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
223+
},
224+
"npm:bitcoinjs-lib@2.1.4": {
225+
"bigi": "npm:bigi@1.4.1",
226+
"bip66": "npm:bip66@1.1.0",
227+
"bs58check": "npm:bs58check@1.0.6",
228+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
229+
"buffer-equals": "npm:buffer-equals@1.0.3",
230+
"buffer-reverse": "npm:buffer-reverse@1.0.0",
231+
"create-hash": "npm:create-hash@1.1.1",
232+
"create-hmac": "npm:create-hmac@1.1.3",
233+
"ecurve": "npm:ecurve@1.0.2",
234+
"randombytes": "npm:randombytes@2.0.1",
235+
"systemjs-json": "github:systemjs/plugin-json@0.1.0",
236+
"typeforce": "npm:typeforce@1.6.1",
237+
"wif": "npm:wif@1.2.1"
238+
},
178239
"npm:bluebird@2.10.0": {
179240
"process": "github:jspm/nodelibs-process@0.1.2"
180241
},
@@ -200,7 +261,7 @@ System.config({
200261
},
201262
"npm:braces@1.8.1": {
202263
"expand-range": "npm:expand-range@1.8.1",
203-
"lazy-cache": "npm:lazy-cache@0.2.3",
264+
"lazy-cache": "npm:lazy-cache@0.2.7",
204265
"preserve": "npm:preserve@0.2.0",
205266
"repeat-element": "npm:repeat-element@1.1.2"
206267
},
@@ -369,6 +430,22 @@ System.config({
369430
"vm-browserify": "npm:vm-browserify@0.0.4",
370431
"xtend": "npm:xtend@4.0.0"
371432
},
433+
"npm:bs58@2.0.1": {
434+
"buffer": "github:jspm/nodelibs-buffer@0.1.0"
435+
},
436+
"npm:bs58check@1.0.6": {
437+
"bs58": "npm:bs58@2.0.1",
438+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
439+
"create-hash": "npm:create-hash@1.1.1",
440+
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
441+
},
442+
"npm:buffer-equals@1.0.3": {
443+
"buffer": "github:jspm/nodelibs-buffer@0.1.0"
444+
},
445+
"npm:buffer-reverse@1.0.0": {
446+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
447+
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
448+
},
372449
"npm:buffer-xor@1.0.2": {
373450
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
374451
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
@@ -378,6 +455,14 @@ System.config({
378455
"ieee754": "npm:ieee754@1.1.6",
379456
"is-array": "npm:is-array@1.0.1"
380457
},
458+
"npm:buffer@3.5.5": {
459+
"base64-js": "npm:base64-js@0.0.8",
460+
"child_process": "github:jspm/nodelibs-child_process@0.1.0",
461+
"fs": "github:jspm/nodelibs-fs@0.1.2",
462+
"ieee754": "npm:ieee754@1.1.6",
463+
"isarray": "npm:isarray@1.0.0",
464+
"process": "github:jspm/nodelibs-process@0.1.2"
465+
},
381466
"npm:bufferutil@1.0.1": {
382467
"bindings": "npm:bindings@1.2.1",
383468
"nan": "npm:nan@1.6.2"
@@ -455,11 +540,6 @@ System.config({
455540
"fs": "github:jspm/nodelibs-fs@0.1.2",
456541
"path": "github:jspm/nodelibs-path@0.1.0"
457542
},
458-
"npm:core-js@1.1.4": {
459-
"fs": "github:jspm/nodelibs-fs@0.1.2",
460-
"process": "github:jspm/nodelibs-process@0.1.2",
461-
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
462-
},
463543
"npm:core-js@1.2.6": {
464544
"fs": "github:jspm/nodelibs-fs@0.1.2",
465545
"path": "github:jspm/nodelibs-path@0.1.0",
@@ -469,6 +549,9 @@ System.config({
469549
"npm:core-util-is@1.0.1": {
470550
"buffer": "github:jspm/nodelibs-buffer@0.1.0"
471551
},
552+
"npm:core-util-is@1.0.2": {
553+
"buffer": "github:jspm/nodelibs-buffer@0.1.0"
554+
},
472555
"npm:create-ecdh@2.0.1": {
473556
"bn.js": "npm:bn.js@2.2.0",
474557
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
@@ -546,6 +629,10 @@ System.config({
546629
"tty": "github:jspm/nodelibs-tty@0.1.0",
547630
"util": "github:jspm/nodelibs-util@0.1.0"
548631
},
632+
"npm:deep-eql@0.1.3": {
633+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
634+
"type-detect": "npm:type-detect@0.1.1"
635+
},
549636
"npm:depd@1.0.1": {
550637
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
551638
"events": "github:jspm/nodelibs-events@0.1.1",
@@ -585,6 +672,12 @@ System.config({
585672
"npm:duplexer2@0.0.2": {
586673
"readable-stream": "npm:readable-stream@1.1.13"
587674
},
675+
"npm:ecurve@1.0.2": {
676+
"assert": "github:jspm/nodelibs-assert@0.1.0",
677+
"bigi": "npm:bigi@1.4.1",
678+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
679+
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
680+
},
588681
"npm:elliptic@3.1.0": {
589682
"bn.js": "npm:bn.js@2.2.0",
590683
"brorand": "npm:brorand@1.0.5",
@@ -783,6 +876,13 @@ System.config({
783876
"npm:hash.js@1.0.3": {
784877
"inherits": "npm:inherits@2.0.1"
785878
},
879+
"npm:hellojs@1.9.9": {
880+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
881+
"http": "github:jspm/nodelibs-http@1.7.1",
882+
"process": "github:jspm/nodelibs-process@0.1.2",
883+
"url": "github:jspm/nodelibs-url@0.1.0",
884+
"util": "github:jspm/nodelibs-util@0.1.0"
885+
},
786886
"npm:http-browserify@1.7.0": {
787887
"Base64": "npm:Base64@0.2.1",
788888
"events": "github:jspm/nodelibs-events@0.1.1",
@@ -814,6 +914,9 @@ System.config({
814914
"string_decoder": "github:jspm/nodelibs-string_decoder@0.1.0",
815915
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
816916
},
917+
"npm:indexeddbshim@2.2.1": {
918+
"process": "github:jspm/nodelibs-process@0.1.2"
919+
},
817920
"npm:inflight@1.0.4": {
818921
"once": "npm:once@1.3.2",
819922
"process": "github:jspm/nodelibs-process@0.1.2",
@@ -857,6 +960,11 @@ System.config({
857960
"http": "github:jspm/nodelibs-http@1.7.1",
858961
"process": "github:jspm/nodelibs-process@0.1.2"
859962
},
963+
"npm:jsrsasign@5.0.5": {
964+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
965+
"fs": "github:jspm/nodelibs-fs@0.1.2",
966+
"process": "github:jspm/nodelibs-process@0.1.2"
967+
},
860968
"npm:karma-browserify@4.3.0": {
861969
"browserify": "npm:browserify@10.2.3",
862970
"convert-source-map": "npm:convert-source-map@0.3.5",
@@ -879,7 +987,7 @@ System.config({
879987
"chokidar": "npm:chokidar@1.0.5",
880988
"colors": "npm:colors@1.1.2",
881989
"connect": "npm:connect@3.4.0",
882-
"core-js": "npm:core-js@1.1.4",
990+
"core-js": "npm:core-js@1.2.6",
883991
"crypto": "github:jspm/nodelibs-crypto@0.1.0",
884992
"di": "npm:di@0.0.1",
885993
"dom-serialize": "npm:dom-serialize@2.2.0",
@@ -919,6 +1027,9 @@ System.config({
9191027
"isarray": "npm:isarray@0.0.1",
9201028
"stream-splicer": "npm:stream-splicer@1.3.2"
9211029
},
1030+
"npm:lazy-cache@0.2.7": {
1031+
"process": "github:jspm/nodelibs-process@0.1.2"
1032+
},
9221033
"npm:levn@0.2.5": {
9231034
"prelude-ls": "npm:prelude-ls@1.1.2",
9241035
"type-check": "npm:type-check@0.3.1"
@@ -1052,6 +1163,9 @@ System.config({
10521163
"npm:next-tick@0.2.2": {
10531164
"process": "github:jspm/nodelibs-process@0.1.2"
10541165
},
1166+
"npm:object.observe@0.2.6": {
1167+
"process": "github:jspm/nodelibs-process@0.1.2"
1168+
},
10551169
"npm:object.omit@1.1.0": {
10561170
"for-own": "npm:for-own@0.1.3",
10571171
"isobject": "npm:isobject@1.0.2"
@@ -1067,7 +1181,7 @@ System.config({
10671181
"minimist": "npm:minimist@0.0.10",
10681182
"path": "github:jspm/nodelibs-path@0.1.0",
10691183
"process": "github:jspm/nodelibs-process@0.1.2",
1070-
"wordwrap": "npm:wordwrap@0.0.3"
1184+
"wordwrap": "npm:wordwrap@0.0.2"
10711185
},
10721186
"npm:optionator@0.5.0": {
10731187
"deep-is": "npm:deep-is@0.1.3",
@@ -1076,11 +1190,16 @@ System.config({
10761190
"prelude-ls": "npm:prelude-ls@1.1.2",
10771191
"process": "github:jspm/nodelibs-process@0.1.2",
10781192
"type-check": "npm:type-check@0.3.1",
1079-
"wordwrap": "npm:wordwrap@0.0.3"
1193+
"wordwrap": "npm:wordwrap@0.0.2"
10801194
},
10811195
"npm:options@0.0.6": {
10821196
"fs": "github:jspm/nodelibs-fs@0.1.2"
10831197
},
1198+
"npm:ortc-over-rtc@0.1.0": {
1199+
"https": "github:jspm/nodelibs-https@0.1.0",
1200+
"path": "github:jspm/nodelibs-path@0.1.0",
1201+
"process": "github:jspm/nodelibs-process@0.1.2"
1202+
},
10841203
"npm:os-browserify@0.1.2": {
10851204
"os": "github:jspm/nodelibs-os@0.1.0"
10861205
},
@@ -1202,7 +1321,7 @@ System.config({
12021321
},
12031322
"npm:readable-stream@1.1.13": {
12041323
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
1205-
"core-util-is": "npm:core-util-is@1.0.1",
1324+
"core-util-is": "npm:core-util-is@1.0.2",
12061325
"events": "github:jspm/nodelibs-events@0.1.1",
12071326
"inherits": "npm:inherits@2.0.1",
12081327
"isarray": "npm:isarray@0.0.1",
@@ -1282,6 +1401,10 @@ System.config({
12821401
"http": "github:jspm/nodelibs-http@1.7.1",
12831402
"util": "github:jspm/nodelibs-util@0.1.0"
12841403
},
1404+
"npm:sjcl@1.0.3": {
1405+
"crypto": "github:jspm/nodelibs-crypto@0.1.0",
1406+
"process": "github:jspm/nodelibs-process@0.1.2"
1407+
},
12851408
"npm:socket.io-adapter@0.3.1": {
12861409
"debug": "npm:debug@1.0.2",
12871410
"events": "github:jspm/nodelibs-events@0.1.1",
@@ -1427,6 +1550,12 @@ System.config({
14271550
"media-typer": "npm:media-typer@0.3.0",
14281551
"mime-types": "npm:mime-types@2.1.6"
14291552
},
1553+
"npm:typeforce@1.6.1": {
1554+
"assert": "github:jspm/nodelibs-assert@0.1.0",
1555+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
1556+
"inherits": "npm:inherits@2.0.1",
1557+
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
1558+
},
14301559
"npm:ultron@1.0.2": {
14311560
"events": "github:jspm/nodelibs-events@0.1.1"
14321561
},
@@ -1480,6 +1609,14 @@ System.config({
14801609
"through2": "npm:through2@0.6.5",
14811610
"xtend": "npm:xtend@4.0.0"
14821611
},
1612+
"npm:webrtc-shim@0.1.2": {
1613+
"process": "github:jspm/nodelibs-process@0.1.2"
1614+
},
1615+
"npm:wif@1.2.1": {
1616+
"bs58check": "npm:bs58check@1.0.6",
1617+
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
1618+
"systemjs-json": "github:systemjs/plugin-json@0.1.0"
1619+
},
14831620
"npm:ws@0.7.1": {
14841621
"buffer": "github:jspm/nodelibs-buffer@0.1.0",
14851622
"bufferutil": "npm:bufferutil@1.0.1",

dist/minibus.js

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/runtime-core.js

Lines changed: 0 additions & 5 deletions
This file was deleted.

dist/runtimeUA.js

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)