Commit Graph

127 Commits

Author SHA1 Message Date
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
Kevin Serrano 1f347c22b0 Update changelog. 2016-07-12 12:08:56 -07:00
Dan Finlay 57da5a8198 Merge branch 'master' into FixSvgIcons 2016-07-11 20:55:58 -07:00
Dan Finlay 539fe3e940 Fix svg icon in notification 2016-07-11 20:44:56 -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
Dan Finlay a446be2397 Version 2.6 2016-07-11 15:54:32 -07:00
Kevin Serrano 86b7cc6637 Resolve merge conflict. 2016-07-07 16:33:06 -07:00
Kevin Serrano f26c47a3fc Modify changelog. 2016-07-07 16:28:40 -07:00
kumavis ac808e681f Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle 2016-07-07 15:04:53 -07:00
Kevin Serrano ecb0f9767b Add new test state with tx history. Fix alignment issue with transaction history text. 2016-07-07 13:48:52 -07:00
Dan Finlay 28617d8710 Bump changelog 2016-07-06 22:57:00 -07:00
kumavis d892fffce2 Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinject 2016-07-06 20:52:28 -07:00
kumavis ec5adf014e changelog - add web3 min dist 2016-07-06 20:22:20 -07:00
Kevin Serrano acdd40e3be Fix dropdown z-index issue. 2016-07-06 20:11:49 -07:00
Frankie 53eefc1efc Add a postion option for tool tip 2016-07-06 17:12:33 -07:00
Kevin Serrano 04c4dad890 Add to changelog. 2016-07-05 12:08:08 -07:00
Dan Finlay 76c473538a Version 2.5.0 2016-07-01 20:15:27 -07:00
Frankie 8465be340a Add to CHANGELOG 2016-06-30 14:57:17 -07:00
Dan Finlay db3f73344b Bump changelog 2016-06-30 11:42:10 -07:00
kumavis 41598a32a6 Merge branch 'master' of github.com:MetaMask/metamask-plugin into networkIndication 2016-06-29 17:12:08 -07:00
Frankie 94768175bf Merge branch 'master' into networkIndication 2016-06-29 16:33:43 -07:00
Frankie 0b3737edb4 Add to change log 2016-06-29 16:31:27 -07:00
Dan Finlay 2b5c42d27f Merge branch 'master' into CopyTxHash 2016-06-29 15:58:31 -07:00
Kevin Serrano 3ae479f5ac Unify wording for transaction options (#369)
* Unify wording for transaction options.

* Modify changelog.

* Fix wording and spacing.
2016-06-29 15:44:37 -07:00
Dan Finlay 57c8922817 Bump changelog 2016-06-29 14:40:13 -07:00
Dan Finlay 757a3ce6be Version 2.4.5 2016-06-29 13:53:37 -07:00
Kevin Serrano e4956c3123 Modify network icons to reflect current design. (#355)
* Modify network icons to reflect current design.

* Switch icons around.
2016-06-28 16:15:26 -07:00
Kevin Serrano c6187b080a Fix out-of-place positioning of pending tx badges. (#354) 2016-06-28 14:25:22 -07:00
kumavis 19f9d6566b Merge branch 'master' into pr/351
# Conflicts:
#	CHANGELOG.md
#	app/scripts/lib/notifications.js
2016-06-28 13:14:38 -07:00
kumavis 57aca116ed Merge branch 'master' into FixSomeFormatting
# Conflicts:
#	CHANGELOG.md
#	app/scripts/lib/notifications.js
2016-06-28 13:11:50 -07:00
Kevin Serrano 661d9bffb3 Changelog update and reduce allowed characters from 30 to 20. 2016-06-28 13:10:29 -07:00
Dan Finlay 9f5b62752e Fix formatting on terms & conditions page 2016-06-28 11:38:29 -07:00
Kevin Serrano 39a758d7c3 Merge changelog. 2016-06-28 11:37:11 -07:00
Kevin Serrano 86a1eaadf1 Enforce 30 character limit on wallet name. 2016-06-28 11:30:55 -07:00
Kevin Serrano 204cb7f1ed Change color of failure to yellow. Change pending to ellipsis. (#338)
* Change color of failure to yellow. Change pending to ellipsis.

* Modify changelog.
2016-06-28 09:33:11 -07:00
Dan Finlay cbcc0438cb Bump changelog 2016-06-24 11:26:17 -07:00
kumavis 2437284515 2.4.4 2016-06-23 12:56:14 -07:00
Frankie 973aa4fd15 close #309 2016-06-22 16:35:34 -07:00
Frankie b3b4983831 Add to change log 2016-06-22 15:49:17 -07:00
Dan Finlay 73869ea233 Version 2.4.2 2016-06-22 11:06:06 -07:00
Dan Finlay 856a7c84cd Bump changelog 2016-06-21 17:21:55 -07:00
Frankie c152f98735 Add to changelog 2016-06-21 15:08:24 -07:00
Dan Finlay d19c286ee8 Version 2.4.0 2016-06-20 15:36:47 -07:00
Dan Finlay 451be3b10e Merge branch 'master' into SignFullDataNotHash 2016-06-16 17:34:44 -07:00
Dan Finlay 65f9f997b0 Bump changelog 2016-06-16 17:22:26 -07:00
Dan Finlay fe83a19c08 Update changelog 2016-06-16 11:48:02 -07:00
Dan Finlay 6ee45a742d Bump changelog 2016-06-14 15:42:40 -07:00
Dan Finlay f599f9ad29 Bump changelog 2016-06-14 15:27:15 -07:00
Dan Finlay d34b7033ef Bump changelog 2016-06-14 15:01:58 -07:00