1
0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Commit Graph

832 Commits

Author SHA1 Message Date
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
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
kumavis
99ca02030a Merge branch 'master' of github.com:MetaMask/metamask-plugin 2016-06-27 17:00:12 -07:00
kumavis
baba719468 notif - change size for better readability 2016-06-27 16:28:07 -07:00
kumavis
c41c4f719f Merge pull request #335 from Zanibas/title-additions
Add alt titles to most critical icons
2016-06-27 13:12:24 -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
kumavis
36c7ffa585 Merge pull request #327 from MetaMask/uiFixes
fix button positioning && mailto link
2016-06-25 12:39:26 -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
36a183db94 Merge pull request #326 from MetaMask/conf-tx-refactor
Tx/Msg Conf page + notifcation refactor
2016-06-24 17:29:38 -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
kumavis
52518a5efc Merge pull request #323 from MetaMask/RefactorBackground
Refactored background.js controller apart from chrome + transport
2016-06-24 17:11:55 -07:00
Dan Finlay
60fec24c00 Debugged by using a real dapp 2016-06-24 17:00:35 -07:00
Dan Finlay
d3e0e7fe45 Manually debugged refactor 2016-06-24 16:46:18 -07:00
Dan Finlay
122018a96a Fixed tests 2016-06-24 16:13:27 -07:00
Dan Finlay
fa7e466559 Rename background-controller metamask-controller 2016-06-24 15:55:11 -07:00
Dan Finlay
b2b3f4b26b Improve refactor
Replace config-manager-singleton with one that is instantiated within the `background-controller`, and takes its persistence callbacks from its instantiated options.

Replaced class getters with more familiar get___() functions.
2016-06-24 15:52:56 -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
Dan Finlay
9ed3c676ec Refactored background.js controller apart from chrome + transport
Still needs linting fixes, probably bugs, this commit should be used as a draft of what a separation of these concerns might look like.
2016-06-24 13:05:21 -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
251cb84afb Merge pull request #322 from MetaMask/i321
identicon - default to imageify
2016-06-24 12:09:44 -07:00
kumavis
c8b6da2593 identicon - default to imageify 2016-06-24 12:07:08 -07:00
kumavis
d3a8f3eebe Merge pull request #320 from MetaMask/i318
send-tx remove account select button
2016-06-24 11:46:40 -07:00