grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
9,325 Commits 1 Branch 329 Tags 59 MiB
602115d81e
Commit Graph

628 Commits

Author SHA1 Message Date
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
Jaco Greeff
4c28ef40b7 Ui 2 shared package (redux, mobx, utils) (#5579) 
* Create @parity/shared

* Move ~/util to shared/util

* Move ~/contracts to shared/contracts

* Move ~/config to shared/config

* Move ~/environment to shared/environment

* Updated paths

* Move ~/mobx to shared/mobx

* Move ~/redux to shared/redux

* Add shared to test babel compile
 2017-05-09 12:01:44 +02:00
Jaco Greeff
073564b508 Merge branch 'master' into ui-2 2017-05-09 10:11:13 +02:00
Jaco Greeff
d91fae4e54 UI 2 tests & webpack dapp build updates/fixes (#5561) 
* Tests are executing again

* Fix tests

* Add missing contextTypes

* IdentityIcon without Connect()

* Update ~/ui tests

* Update spec locations

* Filename case

* Fix playground dapp build
 2017-05-05 15:14:05 +02:00
GitLab Build Bot
0d8920347a [ci skip] js-precompiled 20170505-084643 2017-05-05 08:50:23 +00:00
GitLab Build Bot
4a2ad9fc2a [ci skip] js-precompiled 20170505-083410 2017-05-05 08:38:11 +00:00
Jaco Greeff
9b025cf8c1 Merge branch 'master' into ui-2 
# Conflicts:
#	js/src/views/ContractDevelop/store.js
 2017-05-05 10:08:10 +02:00
GitLab Build Bot
f5bfb208e7 [ci skip] js-precompiled 20170504-161940 2017-05-04 16:23:12 +00:00
Jaco Greeff
c7949e2fc3 Merge branch 'master' into ui-2 2017-05-04 10:39:46 +02:00
GitLab Build Bot
160183b6e8 [ci skip] js-precompiled 20170503-123121 2017-05-03 12:34:57 +00:00
Jaco Greeff
a1502738f1 Merge branch 'master' into ui-2 2017-05-03 10:40:53 +02:00
GitLab Build Bot
b17c6ec054 [ci skip] js-precompiled 20170502-161232 2017-05-02 16:16:27 +00:00
Jaco Greeff
b57e8f6f0d Merge branch 'master' into ui-2 2017-05-02 13:40:05 +02:00
GitLab Build Bot
b0e4c913c0 [ci skip] js-precompiled 20170502-103844 2017-05-02 10:42:38 +00:00
Jaco Greeff
4c04b61f8a Merge branch 'master' into ui-2 2017-04-28 11:26:24 +02:00
GitLab Build Bot
1ed0fedfd5 [ci skip] js-precompiled 20170427-165204 2017-04-27 16:56:27 +00:00
Jaco Greeff
d16cfc736d UI 2 styling (#5518) 
* [ci skip] js-precompiled 20170426-110849

* export topNavigate function

* Stateless components in shell

* Connection icon fill

* Parity overlay only in dapps

* Additional buttons

* Adjust toolbar styles

* Adjust ParityBar button styling

* Complete icon conversion
 2017-04-27 13:28:02 +02:00
GitLab Build Bot
30b3b5e2a7 [ci skip] js-precompiled 20170426-110849 2017-04-26 11:12:52 +00:00
Jaco Greeff
95eeca09b7 Merge branch 'master' into ui-2 2017-04-26 12:39:28 +02:00
Jaco Greeff
3d9deb7770 npm cleanups (#5512) 
* Cleanup @parity modules in npm run clean

* Remove top-level yarn files (only in js)
 2017-04-26 12:38:21 +02:00
Jaco Greeff
1cd0350f83 Merge branch 'master' into ui-2 2017-04-26 12:31:10 +02:00
GitLab Build Bot
012615ae46 [ci skip] js-precompiled 20170426-101558 2017-04-26 10:19:53 +00:00
Craig O'Connor
3be3b78c90 YARN (#5395) 
* YARN

* update package.json

* update package.json

* yarn updates

* npm
 2017-04-26 11:33:29 +02:00
Jaco Greeff
b749718feb Merge branch 'master' into ui-2 
# Conflicts:
#	js/src/views/Signer/RequestsPage/requestsPage.js
 2017-04-25 11:10:23 +02:00
GitLab Build Bot
c9b2a7a980 [ci skip] js-precompiled 20170425-082717 2017-04-25 08:31:15 +00:00
Craig O'Connor
f7d5d6c0cd Cancel tx JS (#4958) 
* Remove transaction RPC

* Bumping multihash and libc

* Updating nanomsg

* bump nanomsg

* cancel tx

* cancel-tx-js

* cancel-tx-js

* cancel-tx-js

* cancel-tx-hs

* cancel-tx-js

* cancel-tx-js

* cancel-tx-js

* small fixes

* edit & time till submit

* edit & time till submit

* updates

* updates

* udpates

* udpates

* grumbles

* step 1

* Wonderful updates

* ready

* small refact

* small refact

* grumbles 1

* ffx2

* good ol' fashioned updates

* latest and greatest

* removeHash

* removeHash

* spec

* fix 1

* fix 1

* fix 2

* fix 2

* ff

* ff

* ff

* updates
 2017-04-25 10:08:09 +02:00