Kevin Serrano
202ff31bf8
Merge branch 'master' into user-agreement-proofread
2016-07-14 23:12:05 -07:00
Kevin Serrano
4926fbd833
Proofread and fix spelling errors of user agreement.
2016-07-14 23:09:53 -07:00
kumavis
0f7f02d187
Merge pull request #443 from MetaMask/legal-beagal
...
Meta - Add license
2016-07-14 14:41:19 -07:00
kumavis
e18dc1d65d
Merge branch 'master' into legal-beagal
2016-07-14 14:38:54 -07:00
kumavis
f84992fa33
license
2016-07-14 14:37:40 -07:00
Dan Finlay
3b80a043ee
Version 2.6.1 ( #442 )
2016-07-14 00:11:49 -07:00
kumavis
97e38b4983
new tx - calculate estimatedGas and show thing in tx-details ( #441 )
...
* new tx - calculate estimatedGas and show thing in tx-details
* Bump changelog
2016-07-13 23:39:44 -07:00
Frankie
dbc9008295
Fix eth balance tooltip to show 6 decimals ( #440 )
...
* Fix tooltip to show to the 6 decimal place on balances ovr 0...
* Change font size for balance component in tx-list so it fits the notation
* Add to change log
* Linting
* change log
2016-07-13 15:46:36 -07:00
kumavis
7b9b22e8a0
Merge pull request #439 from MetaMask/japan-localization
...
Japan localization
2016-07-13 12:20:01 -07:00
Kevin Serrano
2403a833e8
Add Japanese localization file.
2016-07-13 12:17:08 -07:00
Kevin Serrano
fc8d9587d8
Fix MetaMask title for EN.
2016-07-13 12:16:41 -07:00
Kevin Serrano
ad803125cb
Bump provider-engine from 7.8.1 to 7.8.3 ( #435 )
...
* Bump provider-engine from 7.8.1 to 7.8.3
* Modify changelog.
2016-07-13 12:04:46 -07:00
Frankie
617ab9d178
Move fox logo with filled in eyes into design folder ( #433 )
...
* Move fox logo with filled in eyes into design folder
* Crop fox
* Crop fox properly
* Gah Crop fox properly
2016-07-13 11:19:41 -07:00
kumavis
506fe5836f
Merge pull request #431 from MetaMask/one-wallet-one-future
...
Add one wallet to new accounts instead of three.
2016-07-12 19:23:09 -07:00
Kevin Serrano
1f347c22b0
Update changelog.
2016-07-12 12:08:56 -07:00
Kevin Serrano
ecd0a3ec1e
Add one wallet to new accounts instead of three.
2016-07-12 12:06:18 -07:00
kumavis
6537544463
Merge pull request #423 from MetaMask/FixMenuBug
...
Fix main dropdown animation
2016-07-12 00:14:34 -07:00
kumavis
4cf83b582e
Merge branch 'master' of github.com:MetaMask/metamask-plugin into FixMenuBug
2016-07-12 00:12:44 -07:00
Dan Finlay
947665dca1
Merge pull request #428 from MetaMask/FixSvgIcons
...
Fix svg icons
2016-07-11 21:05:18 -07:00
Dan Finlay
57da5a8198
Merge branch 'master' into FixSvgIcons
2016-07-11 20:55:58 -07:00
Dan Finlay
e21a48da83
Linted
2016-07-11 20:53:26 -07:00
Dan Finlay
539fe3e940
Fix svg icon in notification
2016-07-11 20:44:56 -07:00
Dan Finlay
d9718d005c
Merge branch 'master' into FixSvgIcons
2016-07-11 20:44:22 -07:00
Dan Finlay
678f33b06b
Merge pull request #427 from MetaMask/balance-refactor
...
Balance refactor, less-than-one abbreviation for eth balances, util cleanup
2016-07-11 20:32:46 -07:00
Kevin Serrano
38225ac8f5
Merge branch 'master' into balance-refactor
2016-07-11 17:54:16 -07:00
Kevin Serrano
a72aad19c8
Update changelog.
2016-07-11 17:45:20 -07:00
Kevin Serrano
d7e6b752a3
Integrate changes back into eth-balance
2016-07-11 17:44:00 -07:00
Kevin Serrano
6a61591dad
Move shorten balance to util. Add as property of generateBalance object output.
2016-07-11 16:31:12 -07:00
Kevin Serrano
37f21cf18f
Remove unused functions. Readd if necessary.
2016-07-11 16:01:52 -07:00
Dan Finlay
45c64a0830
Merge pull request #426 from MetaMask/Version26
...
Version 2.6
2016-07-11 15:57:24 -07:00
Dan Finlay
a446be2397
Version 2.6
2016-07-11 15:54:32 -07:00
Dan Finlay
a5bac9419a
Rebuild states object
2016-07-11 15:49:22 -07:00
Dan Finlay
66e079f1c7
Fix imageification of recipient
2016-07-11 15:49:13 -07:00
Dan Finlay
3274bb78d7
Add coin sending tx state
2016-07-11 15:47:15 -07:00
Dan Finlay
c4a15340e0
Add notification global for development
...
The background process now has a global `METAMASK_NOTIFIER` object that allows easy mocking of notification data.
2016-07-11 15:45:57 -07:00
Kevin Serrano
31d0d1ec08
Refactor util tests.
2016-07-11 13:57:47 -07:00
Dan Finlay
791911d6f5
Merge branch 'master' into FixMenuBug
2016-07-11 13:45:19 -07:00
Dan Finlay
8cfa21c1e9
Merge pull request #424 from MetaMask/UpdateScript
...
Updated script for what I recorded
2016-07-11 13:44:54 -07:00
Dan Finlay
3c599752d4
Updated script for what I recorded.
2016-07-11 12:06:58 -07:00
Dan Finlay
7b3f0ad43d
Fix main dropdown animation
2016-07-11 11:33:12 -07:00
kumavis
5bb075a278
Merge pull request #418 from MetaMask/ui-fixth-width-tx-history
...
Fixed width applied on transaction history components
2016-07-08 21:37:06 -07:00
Kevin Serrano
40d2b7fe71
lint
2016-07-08 17:39:15 -07:00
Kevin Serrano
20bfb60fd2
Implement alternate shortening scheme.
2016-07-08 17:27:13 -07:00
kumavis
58ee3e1227
Merge branch 'master' of github.com:MetaMask/metamask-plugin into ui-fixth-width-tx-history
2016-07-07 17:39:48 -07:00
kumavis
6d44eaefcb
Merge pull request #419 from MetaMask/ConfirmationStyle
...
Tx Confirmation - fixes
2016-07-07 17:36:28 -07:00
kumavis
d2eab80e09
eth-balance fix
2016-07-07 17:34:30 -07:00
kumavis
501ffba6f2
lint - dingle dangle comma tangle
2016-07-07 17:00:24 -07:00
kumavis
03430e8473
Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle
2016-07-07 16:56:20 -07:00
kumavis
7dc67a9257
notif - add support for forward carrat
2016-07-07 16:54:35 -07:00
Kevin Serrano
86b7cc6637
Resolve merge conflict.
2016-07-07 16:33:06 -07:00
