Commit Graph

233 Commits

Author SHA1 Message Date
Frankie af999e2bee Merge branch 'master' into networkDropdownFix 2016-06-28 17:59:22 -07:00
Frankie 56cbd7d9ea Add custom to drop down menu 2016-06-28 17:57:53 -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 1cd17af2ad Second layer of 20 character check modified. 2016-06-28 13:10:57 -07:00
Kevin Serrano 661d9bffb3 Changelog update and reduce allowed characters from 30 to 20. 2016-06-28 13:10:29 -07:00
Kevin Serrano 4be704097f Merge branch 'master' into title-truncate 2016-06-28 13:08:43 -07:00
Kevin Serrano f9540cf48c Wallet name now is properly truncated. 2016-06-28 13:07:46 -07:00
kumavis 2fd03a60fb Merge pull request #344 from Zanibas/character-limit
Character limit implemented for wallet names
2016-06-28 13:02:34 -07:00
Frankie 16566ee7db Move clearNotifications to popup.js 2016-06-28 12:57:06 -07:00
Kevin Serrano abcf762184 Code style fix. 2016-06-28 12:49:17 -07:00
Kevin Serrano 697e8c0768 Truncate account name further. 2016-06-28 12:48:03 -07:00
Frankie c115203063 fix for linting 2016-06-28 12:08:30 -07:00
Frankie c548a1225b Merge branch 'master' into i340+1 2016-06-28 12:07:48 -07:00
Frankie 4f4c5048bf fix #341 close notifications when oppening pop up 2016-06-28 11:57:33 -07:00
Dan Finlay 6a87259016 Simplify `send ether` button to `send`. 2016-06-28 11:50:42 -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 a69882df72 Additional length check just in case. 2016-06-28 11:34:30 -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
Frankie 3d9bedaeea Fix it so you cant send a negitavie amount of ETH 2016-06-27 17:07:45 -07:00
Kevin Serrano 8c7511e9da Add alt titles to most critical icons
We can change most of these later to a more "elegant" solution, but from the user perspective, having these tooltips is comforting imo.
2016-06-27 11:55:05 -07:00
Frankie ab55fefa1a Merge branch 'master' into uiFixes 2016-06-24 18:02:28 -07:00
Frankie ef743499cb Fix for the mailto link 2016-06-24 17:59:58 -07:00
kumavis 770528d538 clean - appease the linting machine 2016-06-24 17:27:42 -07:00
kumavis d7d440b2c2 svg notif now work for msg signatures 2016-06-24 17:22:27 -07:00
Frankie 4200eeeeed Fix editable button so that it dosent float above the drop down menue 2016-06-24 15:13:48 -07:00
kumavis 86fdcca2ec Merge branch 'master' of github.com:MetaMask/metamask-plugin into conf-tx-refactor 2016-06-24 12:49:02 -07:00
kumavis eb1b9d027f breakout pending-tx-details 2016-06-24 12:48:52 -07:00
kumavis c8b6da2593 identicon - default to imageify 2016-06-24 12:07:08 -07:00
kumavis 02dd1669e7 send-tx remove account select button 2016-06-24 11:44:18 -07:00
kumavis ac2269b16e Merge pull request #312 from MetaMask/svg-notif
initial svg notifications
2016-06-23 17:55:10 -07:00
kumavis 2468949cb5 some legit linting fixes 2016-06-23 16:53:45 -07:00
kumavis be25f4da06 pending-tx pass the identicon pref on 2016-06-23 16:43:10 -07:00
kumavis d293ef0494 account-panel combine panel into account-panel 2016-06-23 16:28:57 -07:00
kumavis e96a53385f accounts - rename account list item so it doesnt overlap 2016-06-23 16:18:47 -07:00
kumavis 7eb89613cc icon-factory - overhaul to provide svg or imagified el 2016-06-23 16:09:25 -07:00
kumavis cc7dbace38 tx-conf add non-interactive mode for notification 2016-06-23 15:25:33 -07:00
kumavis 2495c6ea54 svg notifications - remove unneeded deps and clean code 2016-06-23 15:13:24 -07:00
Dan Finlay a106887a6f Add fox logo back to left of menu
Re-centered metamask h1 manually.
2016-06-23 14:56:33 -07:00
Dan Finlay 4ebb9f631e Moved account change button to menu bar 2016-06-23 14:39:50 -07:00
kumavis 2a3660fe60 Merge branch 'master' of github.com:MetaMask/metamask-plugin into svg-notif 2016-06-23 14:01:16 -07:00
kumavis 122576a790 initial svg notifications 2016-06-22 19:28:11 -07:00
Frankie 973aa4fd15 close #309 2016-06-22 16:35:34 -07:00
Frankie a5c782d69c Remove redundant network option buttons from settings page 2016-06-22 16:19:56 -07:00
Frankie f0e6411277 Swap out Transat font for Montserrat 2016-06-22 15:35:52 -07:00
Frankie ea564e51fc Fix for lint err 2016-06-21 15:30:18 -07:00