Commit Graph

320 Commits

Author SHA1 Message Date
Gav Wood
c12702fc51
Merge remote-tracking branch 'origin/master' into check-updates 2016-12-15 18:23:02 +01:00
GitLab Build Bot
87f1486907 [ci skip] js-precompiled 20161215-170041 2016-12-15 17:03:27 +00: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
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
Jaco Greeff
88a26ec53f Support lint:cached 2016-12-15 10:08:57 +01:00
Jaco Greeff
3df092f29d Add lint:css 2016-12-14 16:42:26 +01:00
Jaco Greeff
2588aea6b2 Merge branch 'master' into check-updates 2016-12-14 14:37:38 +01:00
GitLab Build Bot
1a9a142a69 [ci skip] js-precompiled 20161213-171715 2016-12-13 17:19:48 +00: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
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
9a26caf548 Build settings 2016-12-12 18:29:45 +01:00
GitLab Build Bot
d2a34acdfd [ci skip] js-precompiled 20161212-143454 2016-12-12 14:37:25 +00:00
GitLab Build Bot
1db4647327 [ci skip] js-precompiled 20161212-052342 2016-12-12 05:26:15 +00:00
GitLab Build Bot
f1096619a5 [ci skip] js-precompiled 20161212-034026 2016-12-12 03:43:28 +00:00
GitLab Build Bot
29af24519d [ci skip] js-precompiled 20161211-234535 2016-12-11 23:48:03 +00:00
GitLab Build Bot
2de64bb5e4 [ci skip] js-precompiled 20161211-202217 2016-12-11 20:24:36 +00:00
GitLab Build Bot
f4134cf634 [ci skip] js-precompiled 20161211-193650 2016-12-11 19:39:15 +00:00
GitLab Build Bot
282178e1fa [ci skip] js-precompiled 20161211-190404 2016-12-11 19:06:28 +00:00
GitLab Build Bot
797d787a7b [ci skip] js-precompiled 20161211-164839 2016-12-11 16:51:09 +00:00
Jaco Greeff
885d6eaa4d i18n string dictionaries (#3532)
* TabBar & Settings -> Views i18n enabled

* Proxy i18n

* Settings i18n

* defaultLocale

* Introduce thin Translate wrapper

* PropTypes util caters for multiples

* Translate & LanguageSelector under ui

* Update location & proptypes

* Add UI Language selector

* German settings pages

* Add German language selection

* Corrected umlaut encoding

* Lint

* Re-apply pre-merge conflict changes

* better German i18n

* Language names in locale language

* i8n -> index

* Allow for development/production operation

* Use Yahoo react-intl (as opposed to react-i18nify)

* Use default messages wih expansions

* Remove non-reused variable definitions

* Use FormattedMessage directly, opens up WebPack & Babel opportunities

* Add flat to flatten

* Extract default messages via babel

* Webpack to aggegrate i18n defaultMessage

* Re-add react-intl after merge

* Update proptype references (merge)

* Strip down external dictionary

* i18n for dapps

* Restore tests submodule

* Allow language changes to reflect

* Style updates
2016-12-11 17:42:35 +01:00
GitLab Build Bot
839e3385dd [ci skip] js-precompiled 20161211-155716 2016-12-11 16:00:49 +00:00
GitLab Build Bot
778f5bbfaf [ci skip] js-precompiled 20161211-141210 2016-12-11 14:14:41 +00:00
Nicolas Gotchac
d3077c51fc Target Babel to latest Chrome Versions in dev (#3806)
* Use `babel-preset-env` to target Babel to latest Chrome Versions

* Opt-In mechanism for Babel Preset Env
2016-12-11 15:05:10 +01:00
GitLab Build Bot
95af942fc9 [ci skip] js-precompiled 20161211-093638 2016-12-11 09:40:44 +00:00
GitLab Build Bot
17dee5f1a2 [ci skip] js-precompiled 20161211-091947 2016-12-11 09:22:07 +00:00
Jaco Greeff
36b8e4b6a8 Extended publishing of libraries to npm (#3786)
* Extended publishing of libraries to npm

* Update source links

* Add some tests before publishing NPM library

* Fix Shapeshift tests
2016-12-11 10:13:34 +01:00
GitLab Build Bot
bfb684a641 [ci skip] js-precompiled 20161211-012647 2016-12-11 01:28:52 +00:00
GitLab Build Bot
62492a915e [ci skip] js-precompiled 20161210-230517 2016-12-10 23:07:55 +00:00
Nicolas Gotchac
b0f1665f11 Notify user on transaction received (#3782)
* Notify user on new transaction #2556

* Add routing to account on notification click

* Timeout of notif set to 20s
2016-12-10 23:55:36 +01:00
GitLab Build Bot
5ec1ff43ea [ci skip] js-precompiled 20161210-212741 2016-12-10 21:29:53 +00:00
Nicolas Gotchac
923f85d90d Update Material-UI (#3785)
* Update MUI => Fixes wrong error styled inputs

* Update postcss import
2016-12-10 01:26:03 +01:00
Gav Wood
341777dbb6 Merge pull request #3743 from ethcore/jg-test-ui
Basic UI rendering tests
2016-12-09 23:16:11 +01:00
GitLab Build Bot
647b62b4a2 [ci skip] js-precompiled 20161209-182130 2016-12-09 18:23:46 +00:00
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