Jaco Greeff
|
97c67bc259
|
Merge branch 'master' into ui-2
|
2017-06-21 11:15:29 +02:00 |
|
GitLab Build Bot
|
367a5c998d
|
[ci skip] js-precompiled 20170619-145413
|
2017-06-19 14:58:49 +00:00 |
|
Jaco Greeff
|
4dd26c0d7c
|
Merge branch 'master' into ui-2
|
2017-06-19 10:39:05 +02:00 |
|
GitLab Build Bot
|
42dcdde4e8
|
[ci skip] js-precompiled 20170616-172546
|
2017-06-16 17:30:14 +00:00 |
|
Jaco Greeff
|
121b742482
|
Merge branch 'master' into ui-2
# Conflicts:
# Cargo.lock
# ethcore/src/evm/instructions.rs
# js/package.json
# js/src/modals/CreateAccount/AccountDetails/accountDetails.js
# js/src/modals/FirstRun/TnC/tnc.js
# js/src/modals/FirstRun/Welcome/welcome.js
# js/src/ui/Form/Input/input.js
# js/src/views/Accounts/accounts.js
# js/src/views/Settings/Views/defaults.js
# js/src/views/Settings/Views/views.js
# js/webpack/app.js
# js/webpack/libraries.js
|
2017-06-14 10:16:42 +02:00 |
|
GitLab Build Bot
|
8aa2ed175e
|
[ci skip] js-precompiled 20170613-162317
|
2017-06-13 16:31:45 +00:00 |
|
Jaco Greeff
|
8f5a863468
|
Package updates
|
2017-06-13 13:23:16 +02:00 |
|
Jaco Greeff
|
7bbd48a2bd
|
Merge branch 'master' into ui-2
# Conflicts:
# js/package.json
# js/src/api/local/ethkey/worker.js
# js/src/modals/FirstRun/TnC/tnc.js
# js/src/modals/FirstRun/Welcome/welcome.js
# js/src/ui/Form/Input/input.js
# js/src/ui/VaultCard/Accounts/accounts.spec.js
# js/src/views/Accounts/accounts.js
# js/src/views/Application/TabBar/tabBar.js
# js/src/views/Settings/Views/defaults.js
# js/src/views/Settings/Views/views.js
# js/webpack/app.js
# js/webpack/libraries.js
|
2017-06-13 11:02:38 +02:00 |
|
GitLab Build Bot
|
15f19fc026
|
[ci skip] js-precompiled 20170612-222804
|
2017-06-12 22:32:43 +00:00 |
|
GitLab Build Bot
|
8eda5fcbbf
|
[ci skip] js-precompiled 20170612-164938
|
2017-06-12 16:53:40 +00:00 |
|
Maciej Hirsz
|
b2a42f03eb
|
Public node WASM, performance and fixes (#5734)
|
2017-06-12 15:57:16 +02:00 |
|
Jaco Greeff
|
6a480ffb5b
|
Merge branch 'master' into ui-2
|
2017-06-06 09:35:22 +02:00 |
|
GitLab Build Bot
|
754abdb861
|
[ci skip] js-precompiled 20170604-110515
|
2017-06-04 11:09:12 +00:00 |
|
GitLab Build Bot
|
e89d49d958
|
[ci skip] js-precompiled 20170603-131456
|
2017-06-03 13:18:47 +00:00 |
|
Jaco Greeff
|
d888190637
|
Merge branch 'master' into ui-2
# Conflicts:
# js/src/modals/FirstRun/Welcome/welcome.js
|
2017-05-30 10:45:48 +02:00 |
|
GitLab Build Bot
|
de4c9507e6
|
[ci skip] js-precompiled 20170529-225538
|
2017-05-29 22:59:31 +00:00 |
|
Jaco Greeff
|
37c3f51f6e
|
Update deps for console refactor
|
2017-05-24 14:45:10 +02:00 |
|
Jaco Greeff
|
45c6cc6ac0
|
Merge branch 'master' into ui-2
|
2017-05-24 14:09:51 +02:00 |
|
GitLab Build Bot
|
bbbdd02a00
|
[ci skip] js-precompiled 20170524-104640
|
2017-05-24 10:50:29 +00:00 |
|
GitLab Build Bot
|
6b6555852c
|
[ci skip] js-precompiled 20170523-130314
|
2017-05-23 13:07:10 +00:00 |
|
Jaco Greeff
|
368e3d1f51
|
Merge branch 'master' into ui-2
|
2017-05-22 11:50:15 +02:00 |
|
GitLab Build Bot
|
99a1636c62
|
[ci skip] js-precompiled 20170519-161414
|
2017-05-19 16:18:02 +00:00 |
|
GitLab Build Bot
|
ae0841598f
|
[ci skip] js-precompiled 20170519-154153
|
2017-05-19 15:45:53 +00:00 |
|
Nicolas Gotchac
|
84cab18120
|
Update the Console dapp (#5602)
* Init Console Dapp structure
* Watches and status
* First REPL and display
* Attaching console
* Selectable autocomplete
* working console // Display objects nicely
* Multilines in Console Dapps
* Better UI
* Eval on window object
* Save console gistory
* Adding views
* Add settings to the console dapp
* Add / remove Watches
* Add Snippets Cmponent
* Semi Working Snippets
* Working Snippets
* Adding CodeMirror features
* Removing old Console
* Add Static folder
|
2017-05-19 17:07:59 +02:00 |
|
Jaco Greeff
|
e7abd3510a
|
Use babel-runtime as opposed to babel-polyfill (#5662)
* Add babel-runtime
* Add babel-transform-runtime plugin
* Remove babel-polyfill imports
* Remove babel-polyfill package
* Transform exports to work around webpack 2.2
|
2017-05-19 16:51:15 +02:00 |
|
Jaco Greeff
|
602115d81e
|
Merge branch 'master' into ui-2
# Conflicts:
# js/src/shell/Connection/connection.js
# js/src/ui/Icons/index.js
# js/src/views/Accounts/CreateAccount/RecoveryPhrase/recoveryPhrase.js
|
2017-05-19 14:55:13 +02:00 |
|
GitLab Build Bot
|
23a4a22869
|
[ci skip] js-precompiled 20170518-113124
|
2017-05-18 11:35:53 +00:00 |
|
GitLab Build Bot
|
95d9706fe1
|
[ci skip] js-precompiled 20170518-101141
|
2017-05-18 10:15:33 +00:00 |
|
Jaco Greeff
|
e0927f099e
|
Merge branch 'master' into ui-2
|
2017-05-18 11:26:09 +02:00 |
|
Jaco Greeff
|
4b5a1d01ce
|
Merge remote-tracking branch 'origin/ui-2' into ui-2
|
2017-05-18 10:07:35 +02:00 |
|
Craig O'Connor
|
78461d8a74
|
flow (#5606)
* FLOW
* ui-2-one more fix
|
2017-05-18 10:06:59 +02:00 |
|
GitLab Build Bot
|
2ec51fc0ad
|
[ci skip] js-precompiled 20170517-144631
|
2017-05-17 14:50:24 +00:00 |
|
Jaco Greeff
|
ab86f9e696
|
Merge branch 'master' into ui-2
|
2017-05-17 14:20:07 +02:00 |
|
GitLab Build Bot
|
7626ddc9c3
|
[ci skip] js-precompiled 20170516-145955
|
2017-05-16 15:03:40 +00:00 |
|
Jaco Greeff
|
f7ea667140
|
Merge branch 'master' into ui-2
|
2017-05-16 17:03:17 +02:00 |
|
GitLab Build Bot
|
48ddd8b312
|
[ci skip] js-precompiled 20170516-115901
|
2017-05-16 12:04:56 +00:00 |
|
Jaco Greeff
|
9bc82543ee
|
Merge branch 'master' into ui-2
|
2017-05-12 17:19:50 +02:00 |
|
GitLab Build Bot
|
83a13ee0e6
|
[ci skip] js-precompiled 20170512-102851
|
2017-05-12 10:32:43 +00:00 |
|
Craig O'Connor
|
662a8317a5
|
run-clean (#5607)
|
2017-05-12 12:10:24 +02:00 |
|
Jaco Greeff
|
b1a390983b
|
Merge branch 'master' into ui-2
|
2017-05-11 09:57:39 +02:00 |
|
GitLab Build Bot
|
2b30e0b5e0
|
[ci skip] js-precompiled 20170510-155435
|
2017-05-10 15:58:15 +00:00 |
|
Jaco Greeff
|
566b6a1967
|
Merge branch 'master' into ui-2
# Conflicts:
# js/src/shared/redux/middleware.js
# js/src/shared/redux/providers/registry/middleware.js
# js/src/shell/Application/application.js
# js/src/ui/Actionbar/actionbar.js
# js/src/ui/Button/button.js
# js/src/ui/Form/AddressSelect/addressSelect.js
# js/src/ui/Form/Input/input.js
# js/src/ui/MethodDecoding/methodDecoding.js
|
2017-05-10 17:29:07 +02:00 |
|
GitLab Build Bot
|
710339d0a8
|
[ci skip] js-precompiled 20170510-143939
|
2017-05-10 14:43:30 +00:00 |
|
GitLab Build Bot
|
3e86b2e666
|
[ci skip] js-precompiled 20170510-134918
|
2017-05-10 13:52:55 +00:00 |
|
GitLab Build Bot
|
c58c253cbf
|
[ci skip] js-precompiled 20170510-131400
|
2017-05-10 13:17:46 +00:00 |
|
Jaco Greeff
|
b9c4e5b36c
|
Ui 2 depends & fixes (#5590)
* File paths
* Align balance overlays & sizes
* Copy works as expected
* Re-arrange imports
* Icon props
* Move packages to their original dependencies
* Dependencies to packages
* Update test babel overrides
|
2017-05-10 13:23:14 +02:00 |
|
Jaco Greeff
|
9f91c0490c
|
Merge branch 'master' into ui-2
|
2017-05-09 14:10:24 +02:00 |
|
GitLab Build Bot
|
518b6e647b
|
[ci skip] js-precompiled 20170509-115458
|
2017-05-09 11:58:48 +00:00 |
|
Jaco Greeff
|
40744d1bd2
|
Merge branch 'master' into ui-2
|
2017-05-09 13:47:29 +02:00 |
|
GitLab Build Bot
|
9947493977
|
[ci skip] js-precompiled 20170509-112134
|
2017-05-09 11:25:44 +00:00 |
|