m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-24 11:01:41 +01:00
Code
963 Commits 2 Branches 0 Tags 265 MiB
9b43ec2278
Commit Graph

963 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dan Finlay
ab5730aa26 Merge branch 'master' of github.com:MetaMask/metamask-plugin 2016-06-29 17:26:48 -07:00
Dan Finlay
d34dcc66d7 Add gitattributes file for the changelog 2016-06-29 17:26:24 -07:00
kumavis
4433618e95 Merge pull request #370 from MetaMask/networkIndication 
Network indication
 2016-06-29 17:14:16 -07:00
kumavis
41598a32a6 Merge branch 'master' of github.com:MetaMask/metamask-plugin into networkIndication 2016-06-29 17:12:08 -07:00
kumavis
f7bb3cdcfe Merge pull request #368 from MetaMask/CopyTxHash 
Copy tx hash
 2016-06-29 17:06:31 -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
57c8922817 Bump changelog 2016-06-29 14:40:13 -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
Dan Finlay
757a3ce6be Version 2.4.5 2016-06-29 13:53:37 -07:00
kumavis
8d9a0e7177 Merge pull request #356 from MetaMask/networkDropdownFix 
Network dropdown fix
 2016-06-29 10:02:35 -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
6238af6330 fix bad merge 2016-06-28 13:21:25 -07:00
kumavis
f1a94afca7 Merge pull request #352 from MetaMask/pr/351 
Limit account nicknames
 2016-06-28 13:16:41 -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
913533522f Merge pull request #350 from MetaMask/notif2 
Notifications - improved readability and data
 2016-06-28 13:13:20 -07:00
kumavis
4777f82ae0 Merge branch 'master' into notif2 2016-06-28 13:13:06 -07:00
kumavis
d4708828aa Merge pull request #345 from MetaMask/FixSomeFormatting 
Fix some formatting
 2016-06-28 13:12:15 -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
kumavis
494b62dcf8 Merge branch 'master' into FixSomeFormatting 2016-06-28 13:09:03 -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
56087543c8 clean - remove svg notifications doc 2016-06-28 13:03:16 -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
kumavis
7026eca222 Merge pull request #348 from MetaMask/i341 
Clear notifications on extension open + guard against negative sends
 2016-06-28 13:00:37 -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
kumavis
b1d5a332c0 fix typo 2016-06-28 12:41:37 -07:00
kumavis
c82d7585b8 background - prepare state for notifcations 2016-06-28 12:36:53 -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
kumavis
621e28f6a2 Merge branch 'master' of github.com:MetaMask/metamask-plugin into notif2 2016-06-28 12:03:21 -07:00