1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02:00
Commit Graph

240 Commits

Author SHA1 Message Date
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
2880f8631c Unify tooltip styles
Made a local tooltip component for replicating our tooltip styles wherever we use tooltips.

Applied that tooltip to other items that had tooltips.
2016-06-29 16:21:38 -07:00
Frankie
e0daea35a9 Add network name to indicator and some css fixes
-also fix custom net work bug in drop down where it
thinks local:8545 is custom.
2016-06-29 16:12:19 -07:00
Dan Finlay
2b5c42d27f Merge branch 'master' into CopyTxHash 2016-06-29 15:58:31 -07:00
Dan Finlay
78e6ed22be Add tooltip to copy button 2016-06-29 15:57:59 -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
Frankie
2c36c17238 Add ✓ charchter to indicate active network 2016-06-29 15:04:16 -07:00
Dan Finlay
7f92a8da06 Use clipboard icon for copy button 2016-06-29 14:39:25 -07:00
Dan Finlay
fb92b8a5fe Add copy button to transaction list 2016-06-29 14:12:58 -07:00
Dan Finlay
5c57169219 Replace manual copy buttons with new CopyButton component 2016-06-29 14:11:31 -07:00
Dan Finlay
441a7eec28 Add CopyButton component 2016-06-29 14:11:12 -07:00
Frankie
ce03356f5f Remove missused action 2016-06-28 19:10:27 -07:00
Frankie
dbae676858 Make it so that when you click the custom rpc url it closes the dropdown menu 2016-06-28 18:47:17 -07:00
Frankie
f3119d40f5 fix lint 2016-06-28 18:06:10 -07:00
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