1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-30 08:09:15 +01:00
Commit Graph

256 Commits

Author SHA1 Message Date
Dan Finlay
71df05c5ff Put network status checkmarks at end of row 2016-07-01 15:04:38 -07:00
Dan Finlay
287222df25 Linted 2016-07-01 10:32:54 -07:00
Dan Finlay
51a5e66cbb Move main drop-down state to component state 2016-07-01 10:25:19 -07:00
Dan Finlay
6ec387b675 Formatted dev mode better 2016-06-30 23:50:20 -07:00
Dan Finlay
7f9200b1bf Added some basic styles 2016-06-30 23:15:45 -07:00
kumavis
5a917431d8 disclaimer - render via react-markdown 2016-06-30 21:46:19 -07:00
Dan Finlay
a0a676c3e2 Remove old disclaimer 2016-06-30 21:24:14 -07:00
Dan Finlay
d33d4f0654 Merge branch 'master' into FrankieDisclaimer 2016-06-30 21:22:39 -07:00
kumavis
d4e400e5e5 Merge pull request #378 from MetaMask/UiDev
Ui dev
2016-06-30 21:20:40 -07:00
Dan Finlay
aa21c83470 Add new user agreement 2016-06-30 20:54:51 -07:00
Dan Finlay
2843459fcf Make info page not chrome dependent 2016-06-30 18:23:05 -07:00
Dan Finlay
e55938ed15 First simple version of ui mocker 2016-06-30 18:22:16 -07:00
Frankie
1b1bb92fd3 Merge branch 'master' into compactLayout 2016-06-30 14:56:10 -07:00
Frankie
42cd0b69e7 Implemt new account layout 2016-06-30 14:53:24 -07:00
Dan Finlay
179d176dc1 Fix broken action reference 2016-06-30 11:30:31 -07:00
Frankie
5252504e3f WIP: Working on new layout 2016-06-30 11:15:32 -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
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