Commit Graph

283 Commits

Author SHA1 Message Date
Jaco Greeff
a73e0a987e Merge branch 'master' into jg-test-ui 2016-12-09 18:34:58 +01:00
GitLab Build Bot
fd23a2972c [ci skip] js-precompiled 20161209-165845 2016-12-09 17:00:59 +00:00
GitLab Build Bot
1213ada59c [ci skip] js-precompiled 20161209-125036 2016-12-09 12:52:50 +00:00
Jaco Greeff
00c53a8d18 Merge branch 'master' into jg-test-ui 2016-12-09 13:36:50 +01:00
Jaco Greeff
a133e41e16 Merge branch 'master' into jg-test-ui 2016-12-09 09:53:55 +01:00
GitLab Build Bot
83f791fa5d [ci skip] js-precompiled 20161209-044115 2016-12-09 04:43:19 +00:00
GitLab Build Bot
12592689dd [ci skip] js-precompiled 20161209-014235 2016-12-09 01:44:45 +00:00
Jaco Greeff
f9a24f3c8e Update babel, fix CI build due to breaking changes (#3754)
* Update babel to latest version

* Re-add circular deps plugin

* Bump for build

* Fixes for babel build
2016-12-09 02:33:12 +01:00
GitLab Build Bot
e1ad347cdb [ci skip] js-precompiled 20161209-003004 2016-12-09 00:32:45 +00:00
Jaco Greeff
0544e0e786 Merge branch 'jg-test-ui-2' into jg-test-ui 2016-12-08 17:33:02 +01:00
Jaco Greeff
507b4b68a1 Merge branch 'master' into jg-test-ui 2016-12-08 16:50:23 +01:00
Jaco Greeff
9e8fb616d3 Add store tests, fix issue with pending sort to top 2016-12-08 16:50:19 +01:00
GitLab Build Bot
4e1b72b45c [ci skip] js-precompiled 20161208-150237 2016-12-08 15:04:38 +00:00
GitLab Build Bot
69e010bbf9 [ci skip] js-precompiled 20161208-144436 2016-12-08 14:46:49 +00:00
Jaco Greeff
543428fe5d NODE_ENV=test for all tests 2016-12-08 12:59:59 +01:00
Jaco Greeff
88e5ed9ea5 Allow mocha to use webpack aliasses via babel 2016-12-08 12:18:43 +01:00
GitLab Build Bot
9e8d90b5ba [ci skip] js-precompiled 20161207-173717 2016-12-07 17:39:18 +00:00
GitLab Build Bot
3388eab76a [ci skip] js-precompiled 20161207-123833 2016-12-07 12:40:35 +00:00
GitLab Build Bot
2e40a00768 [ci skip] js-precompiled 20161207-122336 2016-12-07 12:26:14 +00:00
GitLab Build Bot
97e60a6e9c [ci skip] js-precompiled 20161207-042556 2016-12-07 04:28:25 +00:00
GitLab Build Bot
0f76533713 [ci skip] js-precompiled 20161206-084538 2016-12-06 08:47:58 +00:00
GitLab Build Bot
98bfbdc5cb [ci skip] js-precompiled 20161205-174841 2016-12-05 17:50:43 +00:00
GitLab Build Bot
e6ed49b2c9 [ci skip] js-precompiled 20161205-150312 2016-12-05 15:05:10 +00:00
GitLab Build Bot
cf796d3ea4 [ci skip] js-precompiled 20161205-105433 2016-12-05 10:56:28 +00:00
Nicolas Gotchac
9a43e6d6c8 Update JS dependencies (#3710)
* Minor Versions NPM updates

* Remove unused packages

* No longer relevant JS test

* Update some major versions // Revert Rechartjs

* Update Redux/React-{Ace, RouterRedux}

* Updated React Tooltips

* Update mock-socket // Update tests to pass

* Updated React Router

* Removed `history` module that isn't necessary (instead of updating it)

* Updated redux-actions

* Removed commented hot store reload
2016-12-05 11:48:43 +01:00
GitLab Build Bot
a9424bdf26 [ci skip] js-precompiled 20161204-042533 2016-12-04 04:27:27 +00:00
GitLab Build Bot
ca4aa42615 [ci skip] js-precompiled 20161203-062111 2016-12-03 06:23:18 +00:00
GitLab Build Bot
f093b077a4 [ci skip] js-precompiled 20161203-043512 2016-12-03 04:37:04 +00:00
GitLab Build Bot
f15906fe8d [ci skip] js-precompiled 20161202-201514 2016-12-02 20:18:10 +00:00
GitLab Build Bot
4c32d3ced4 [ci skip] js-precompiled 20161202-142708 2016-12-02 14:29:56 +00:00
Jaco Greeff
b8b9086dae React library update (#3704)
* Update React & MaterialUI

* Adjust TabBar layouts for new MUI
2016-12-02 15:21:25 +01:00
GitLab Build Bot
986e8ef9a2 [ci skip] js-precompiled 20161202-052414 2016-12-02 05:26:08 +00:00
GitLab Build Bot
f30a8f79f2 [ci skip] js-precompiled 20161202-034812 2016-12-02 03:50:41 +00:00
GitLab Build Bot
0f987a2206 [ci skip] js-precompiled 20161201-044643 2016-12-01 04:48:29 +00:00
GitLab Build Bot
3ef569329a [ci skip] js-precompiled 20161201-011624 2016-12-01 01:21:59 +00:00
Gav Wood
6420ea4429 Merge pull request #3694 from ethcore/jr-print-recovery-phrase
button to print recovery phrase
2016-12-01 01:11:01 +00:00
GitLab Build Bot
4f4bfb2239 [ci skip] js-precompiled 20161130-204501 2016-11-30 20:46:47 +00:00
Jannis R
eee03b542d
add account recovery phrase page 2016-11-30 19:51:03 +01:00
GitLab Build Bot
837ff1bc7d [ci skip] js-precompiled 20161130-104916 2016-11-30 10:54:38 +00:00
GitLab Build Bot
cfc1dabd57 [ci skip] js-precompiled 20161129-050158 2016-11-29 05:07:32 +00:00
GitLab Build Bot
261aa29db3 [ci skip] js-precompiled 20161128-232953 2016-11-28 23:31:43 +00:00
Nicolas Gotchac
d78de18385 Merge branch 'master' into ng-webpack-update 2016-11-28 17:56:47 +01:00
GitLab Build Bot
3c9983cf25 [ci skip] js-precompiled 20161128-164710 2016-11-28 16:48:55 +00:00
Jannis Redmann
5f570edf3b update SMS verification (#3579)
* add isTestnet helper

* sms verification: use different port on testnet

* subscribeToEvent helper

* sms verification: await Puzzled event

* sms verification: bugfixes 🐛, move awaitPuzzle

* sms verification: check upfront if code is valid

* sms verification: more helpful phone input label

* isTestnet helper -> redux state
2016-11-28 17:39:55 +01:00
GitLab Build Bot
ecf283e2fc [ci skip] js-precompiled 20161128-151919 2016-11-28 15:21:01 +00:00
Nicolas Gotchac
d41c60da54 Renaming webpack/config to webpack/app 2016-11-28 16:06:27 +01:00
Nicolas Gotchac
b823b675a4 Working HOT RELOAD !! 2016-11-28 12:37:13 +01:00
Nicolas Gotchac
f9b3a98ff7 Fixing mocha tests 2016-11-26 17:27:44 +01:00
Nicolas Gotchac
44e099000d Working webpack build // Without Hot Reload 2016-11-26 17:12:52 +01:00
Nicolas Gotchac
002c793f53 Added Webpack check circular deps 2016-11-26 16:53:24 +01:00
Nicolas Gotchac
8392090861 WIP - Webpack 2 building 2016-11-25 19:32:58 +01:00
Nicolas Gotchac
a534949b2d Updated packages version... 2016-11-25 17:33:18 +01:00
Nicolas Gotchac
807790ce95 Merge branch 'master' into ng-webpack-update 2016-11-25 17:17:06 +01:00
Nicolas Gotchac
24bdf1cb98 Use webpack hot/dev middlewares 2016-11-25 13:14:30 +01:00
GitLab Build Bot
686978fa97 [ci skip] js-precompiled 20161125-113155 2016-11-25 11:36:32 +00:00
GitLab Build Bot
4d9492a01d [ci skip] js-precompiled 20161124-231507 2016-11-24 23:16:52 +00:00
GitLab Build Bot
815cdc6ba1 [ci skip] js-precompiled 20161124-164849 2016-11-24 16:50:27 +00:00
GitLab Build Bot
51afc3afbe [ci skip] js-precompiled 20161124-163141 2016-11-24 16:40:11 +00:00
GitLab Build Bot
905d0c0b43 [ci skip] js-precompiled 20161124-154751 2016-11-24 15:50:50 +00:00
Nicolas Gotchac
0750d82115 Reuse Webpack Configs 2016-11-24 03:11:54 +01:00
Nicolas Gotchac
1291130f9e Simpler Webpack config : create HTML files for dapps 2016-11-24 02:28:33 +01:00
GitLab Build Bot
8f9f5cd5a3 [ci skip] js-precompiled 20161123-205310 2016-11-23 20:55:02 +00:00
GitLab Build Bot
273165e982 [ci skip] js-precompiled 20161123-185249 2016-11-23 18:54:40 +00:00
GitLab Build Bot
e7dd222142 [ci skip] js-precompiled 20161123-131908 2016-11-23 13:20:46 +00:00
GitLab Build Bot
24ffb30bc2 [ci skip] js-precompiled 20161123-105837 2016-11-23 11:00:19 +00:00
GitLab Build Bot
5bd6d5e3ac [ci skip] js-precompiled 20161123-102835 2016-11-23 10:32:27 +00:00
GitLab Build Bot
cbeb2dc3f9 [ci skip] js-precompiled 20161122-175502 2016-11-22 17:57:03 +00:00
GitLab Build Bot
9f74c76f07 [ci skip] js-precompiled 20161122-162239 2016-11-22 16:25:02 +00:00
Gav Wood
490b39cc85 Merge pull request #3555 from ethcore/ng-fast-ui
Faster UI - React Tweaks
2016-11-22 17:05:23 +01:00
GitLab Build Bot
12ff42a513 [ci skip] js-precompiled 20161122-151225 2016-11-22 15:14:06 +00:00
GitLab Build Bot
b97763e13d [ci skip] js-precompiled 20161121-233309 2016-11-21 23:35:10 +00:00
GitLab Build Bot
eb94eda30b [ci skip] js-precompiled 20161121-181249 2016-11-21 18:16:10 +00:00
GitLab Build Bot
65785475f3 [ci skip] js-precompiled 20161121-173542 2016-11-21 17:37:37 +00:00
Nicolas Gotchac
ca5fd0b23d React Perf in dev mode // Smarter background component #3240 2016-11-21 14:14:25 +01:00
GitLab Build Bot
21b2b4ac27 [ci skip] js-precompiled 20161121-093611 2016-11-21 09:37:54 +00:00
GitLab Build Bot
92a34d9dd8 [ci skip] js-precompiled 20161120-160026 2016-11-20 16:06:52 +00:00
GitLab Build Bot
9832be395f [ci skip] js-precompiled 20161120-133314 2016-11-20 13:35:00 +00:00
GitLab Build Bot
ab4941b5ee [ci skip] js-precompiled 20161120-132620 2016-11-20 13:28:04 +00:00
GitLab Build Bot
60922b61c9 [ci skip] js-precompiled 20161118-192308 2016-11-18 19:27:32 +00:00
Nicolas Gotchac
128cd2a8e4 Fixing JS tests 2016-11-18 18:14:34 +01:00
Nicolas Gotchac
ffc94343fe Fix version for NPM 2016-11-18 17:44:40 +01:00
GitLab Build Bot
55a3da8f0a [ci skip] js-precompiled 20161118-134410 2016-11-18 13:46:22 +00:00
Nicolas Gotchac
3ec256cd7b Merge branch 'master' into ng-fix-parity-jsapi 2016-11-17 17:51:05 +01:00
GitLab Build Bot
b79d65c0f3 [ci skip] js-precompiled 20161117-160039 2016-11-17 16:02:23 +00:00
Nicolas Gotchac
4f50a63dbc Remove node_modules dir after tests 2016-11-17 16:44:19 +01:00
Nicolas Gotchac
b633631f42 Npm install in npm test 2016-11-17 16:43:41 +01:00
Gav Wood
25a7ff1433 Merge pull request #3336 from ethcore/sms-verification-modal
sms verification modal
2016-11-17 23:42:12 +08:00
Nicolas Gotchac
73b4b4d241 Added library test (node only) #3471 2016-11-17 16:39:36 +01:00
GitLab Build Bot
7b866b4a1b [ci skip] js-precompiled 20161117-141135 2016-11-17 14:13:10 +00:00
Jannis R
a59526099d
merge master into sms-verification-modal 2016-11-17 12:40:22 +01:00
GitLab Build Bot
76ac87af8b [ci skip] js-precompiled 20161117-101458 2016-11-17 10:16:40 +00:00
Nicolas Gotchac
3ad7e873e1 Better use of Webpack #3471 2016-11-16 19:16:55 +01:00
Nicolas Gotchac
6c60aaec08 Merge branch 'master' into ng-fix-parity-jsapi 2016-11-16 18:58:15 +01:00
Nicolas Gotchac
7144da5d7e Handle Signer Rejection // Real Custom Errors #3153 2016-11-16 18:55:53 +01:00
GitLab Build Bot
a7574a1108 [ci skip] js-precompiled 20161116-161024 2016-11-16 16:12:55 +00:00
Nicolas Gotchac
6fa863f2cc Make parity.js usable by Node and Browser #3471 2016-11-16 16:52:05 +01:00
Jannis R
ed2b8e14fc
merge master into sms-verification-modal 2016-11-16 13:29:46 +01:00
GitLab Build Bot
a9596abf5c [ci skip] js-precompiled 20161115-212437 2016-11-15 21:26:09 +00:00
GitLab Build Bot
3addae9313 [ci skip] js-precompiled 20161115-194902 2016-11-15 19:50:43 +00:00
Jannis R
7a83fb8595
merge master into sms-verification-modal 2016-11-15 17:04:36 +01:00