Gav Wood
|
5bab14e0c0
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-15 21:15:25 +01:00 |
|
Gav Wood
|
5fb34573c6
|
Merge pull request #3864 from ethcore/jr-fix-verification
fix verification stores
|
2016-12-15 21:13:05 +01:00 |
|
Jannis R
|
d2962fe47b
|
store certifier index in constant
|
2016-12-15 20:47:41 +01:00 |
|
GitLab Build Bot
|
867fdb9eac
|
[ci skip] js-precompiled 20161215-172100
|
2016-12-15 17:23:53 +00:00 |
|
Gav Wood
|
c12702fc51
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-15 18:23:02 +01:00 |
|
Jannis R
|
7fdcc70825
|
Merge jg-contract-subid into jr-fix-verification
|
2016-12-15 18:12:45 +01:00 |
|
Jaco Greeff
|
1f1dc8b89d
|
Store subscriptionId, use it to send changes
|
2016-12-15 18:09:59 +01:00 |
|
Jannis R
|
0e963da27b
|
fix verification stores 🐛
|
2016-12-15 18:09:52 +01:00 |
|
GitLab Build Bot
|
87f1486907
|
[ci skip] js-precompiled 20161215-170041
|
2016-12-15 17:03:27 +00:00 |
|
Jaco Greeff
|
17781a5ac4
|
Fix typo in method call
|
2016-12-15 17:52:28 +01:00 |
|
Jaco Greeff
|
9dd1268b69
|
Add keys for steps (future-proof)
|
2016-12-15 15:56:58 +01:00 |
|
Gav Wood
|
590428e7f2
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-15 15:12:09 +01:00 |
|
GitLab Build Bot
|
7e76d6494c
|
[ci skip] js-precompiled 20161215-134858
|
2016-12-15 13:52:59 +00:00 |
|
Gav Wood
|
d76239ed48
|
Merge pull request #3768 from ethcore/jr-use-badge-reg
get certifications from BadgeReg, show them in accounts overview
|
2016-12-15 14:43:05 +01:00 |
|
GitLab Build Bot
|
6dfcbd4156
|
[ci skip] js-precompiled 20161215-130206
|
2016-12-15 13:06:03 +00:00 |
|
Jaco Greeff
|
054a6a9daf
|
Merge branch 'master' into check-updates
# Conflicts:
# .gitlab-ci.yml
# js/webpack/dev.server.js
|
2016-12-15 13:52:28 +01:00 |
|
Gav Wood
|
be0d5ca516
|
Merge pull request #3827 from ethcore/jr-first-run
first run: skip account creation if they already have accounts
|
2016-12-15 13:52:01 +01:00 |
|
Jannis R
|
4c42dedcad
|
sort props 💄
|
2016-12-15 13:51:44 +01:00 |
|
Jannis R
|
f59f7c5773
|
address style grumbles 💄
|
2016-12-15 13:48:40 +01:00 |
|
Gav Wood
|
1ebbb8ae3d
|
Merge pull request #3852 from ethcore/js-css-lint
Expand lint to catch css issues
|
2016-12-15 13:09:51 +01:00 |
|
Gav Wood
|
8fa00a20e6
|
Merge pull request #3851 from ethcore/js-inject-all
inject exports both partiy & web3
|
2016-12-15 13:09:29 +01:00 |
|
Jaco Greeff
|
88a26ec53f
|
Support lint:cached
|
2016-12-15 10:08:57 +01:00 |
|
Jaco Greeff
|
9fc3c47bcb
|
inject exports both partiy & web3
|
2016-12-15 10:05:52 +01:00 |
|
Nicolas Gotchac
|
15050da1cd
|
Let Webpack talk again
|
2016-12-15 00:07:49 +01:00 |
|
Jaco Greeff
|
3df092f29d
|
Add lint:css
|
2016-12-14 16:42:26 +01:00 |
|
Jaco Greeff
|
7330612bfb
|
Toggle upgrade modal via upgrade link
|
2016-12-14 15:56:01 +01:00 |
|
Jaco Greeff
|
2588aea6b2
|
Merge branch 'master' into check-updates
|
2016-12-14 14:37:38 +01:00 |
|
Jaco Greeff
|
a8f428ccca
|
Display capability status on statusbar
|
2016-12-14 14:37:25 +01:00 |
|
Jaco Greeff
|
d28ec2ff97
|
Make enode available on Status page
|
2016-12-14 13:41:29 +01:00 |
|
Jannis R
|
bbcae3d27b
|
merge master into jr-first-run
|
2016-12-14 12:28:55 +01:00 |
|
Jannis R
|
240bab230c
|
merge master into jr-use-badge-reg
|
2016-12-14 12:26:18 +01:00 |
|
GitLab Build Bot
|
1a9a142a69
|
[ci skip] js-precompiled 20161213-171715
|
2016-12-13 17:19:48 +00:00 |
|
Gav Wood
|
72b8ee84c7
|
Merge pull request #3766 from ethcore/jr-email-verification
email verification
|
2016-12-13 18:09:41 +01:00 |
|
Gav Wood
|
c6281fc1c7
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-13 17:26:09 +01:00 |
|
GitLab Build Bot
|
1114ad3ca7
|
[ci skip] js-precompiled 20161213-051314
|
2016-12-13 05:15:44 +00:00 |
|
Jaco Greeff
|
51b544c2db
|
Simplify icon exports
|
2016-12-12 23:53:29 +01:00 |
|
Jaco Greeff
|
dbc6b42267
|
Lint fixes
|
2016-12-12 23:14:44 +01:00 |
|
Jaco Greeff
|
9931d7657a
|
Merge remote-tracking branch 'origin/check-updates' into check-updates
|
2016-12-12 23:07:41 +01:00 |
|
Jaco Greeff
|
e170134d97
|
Merge branch 'master' into check-updates
|
2016-12-12 22:45:12 +01:00 |
|
Jaco Greeff
|
f15671c74b
|
UI interface completed, to be tested
|
2016-12-12 22:45:09 +01:00 |
|
Jaco Greeff
|
a8ae9b02f9
|
Typo
|
2016-12-12 18:58:31 +01:00 |
|
Jaco Greeff
|
a2a89f7e59
|
Basic UI structure in-place
|
2016-12-12 18:30:41 +01:00 |
|
Jaco Greeff
|
7a0fccf417
|
Add shared icons
|
2016-12-12 18:30:05 +01:00 |
|
Jaco Greeff
|
9a26caf548
|
Build settings
|
2016-12-12 18:29:45 +01:00 |
|
Gav Wood
|
ab4d666681
|
Merge remote-tracking branch 'origin/master' into check-updates
|
2016-12-12 16:35:11 +01:00 |
|
Jaco Greeff
|
1135674eaa
|
WIP UI (dialog available)
|
2016-12-12 15:51:36 +01:00 |
|
Jaco Greeff
|
c784ab55d2
|
Extend jsapi interfaces with documentation
|
2016-12-12 15:43:59 +01:00 |
|
GitLab Build Bot
|
d2a34acdfd
|
[ci skip] js-precompiled 20161212-143454
|
2016-12-12 14:37:25 +00:00 |
|
Jannis R
|
b980e7a329
|
add skip button to first run modal
|
2016-12-12 14:32:55 +01:00 |
|
Jannis R
|
085adbaffd
|
make showFirstRun in localStorage a bool
|
2016-12-12 14:15:26 +01:00 |
|