Commit Graph

607 Commits

Author SHA1 Message Date
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
Jaco Greeff
fcdd19e105 Merge branch 'master' into ui-2 2017-04-21 15:42:23 +02:00
Jaco Greeff
b3dfc0b6db Merge branch 'jg-split-abi-api' into ui-2 2017-04-21 11:21:54 +02:00
GitLab Build Bot
70c82c0f61 [ci skip] js-precompiled 20170420-192450 2017-04-20 19:28:34 +00:00
Jaco Greeff
4b403266ea Merge branch 'master' into jg-split-abi-api 2017-04-20 15:47:24 +02:00
Jaco Greeff
89e5601ec0 blockies dep -> api 2017-04-20 15:47:20 +02:00
Jaco Greeff
9652c0fabb UI packages to ui 2017-04-20 15:45:31 +02:00
Jaco Greeff
8a46a4b567 Move API dependencies 2017-04-20 11:24:49 +02:00
Jaco Greeff
94c8cceb42 Add @parity/jsonrpc 2017-04-20 10:41:06 +02:00
Jaco Greeff
0d9e849162 Build with @parity/(abi|api) packages 2017-04-20 10:34:23 +02:00
GitLab Build Bot
0d40df937b [ci skip] js-precompiled 20170419-162101 2017-04-19 16:24:42 +00:00
GitLab Build Bot
7d07c550ba [ci skip] js-precompiled 20170419-161237 2017-04-19 16:16:20 +00:00
GitLab Build Bot
770c7e5878 [ci skip] js-precompiled 20170419-142847 2017-04-19 14:32:38 +00:00
GitLab Build Bot
8310877f25 [ci skip] js-precompiled 20170419-133906 2017-04-19 13:42:54 +00:00
GitLab Build Bot
1e6674f804 [ci skip] js-precompiled 20170413-083353 2017-04-13 08:37:35 +00:00
GitLab Build Bot
d99f1e5f1f [ci skip] js-precompiled 20170412-114838 2017-04-12 11:52:33 +00:00
GitLab Build Bot
a0d83537e5 [ci skip] js-precompiled 20170412-104510 2017-04-12 10:48:49 +00:00
GitLab Build Bot
e84d03f31d [ci skip] js-precompiled 20170411-150514 2017-04-11 15:08:42 +00:00
GitLab Build Bot
a2bec1edb4 [ci skip] js-precompiled 20170410-094150 2017-04-10 09:45:12 +00:00
GitLab Build Bot
bca0c6c172 [ci skip] js-precompiled 20170408-095429 2017-04-08 09:57:43 +00:00
GitLab Build Bot
5ebd38f1d6 [ci skip] js-precompiled 20170405-145308 2017-04-05 14:58:00 +00:00
GitLab Build Bot
8d0fde6f60 [ci skip] js-precompiled 20170405-090226 2017-04-05 09:06:09 +00:00