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

1005 Commits

Author SHA1 Message Date
Kevin Serrano
479abadaa7 Merge branch 'master' into usd-conversion 2016-08-04 13:26:03 -07:00
Kevin Serrano
106cbc133f Merge pull request #518 from MetaMask/typo-fix
Typo fix for apostrophes
2016-08-05 03:28:25 +09:00
Kevin Serrano
f42723c903 Add to changelog. 2016-08-04 11:24:25 -07:00
Kevin Serrano
31b38e820b Fix typos with missing apostrophe 2016-08-04 11:14:39 -07:00
Frankie
d5cb1cb820 Merge pull request #517 from MetaMask/i#516
Fix #516 issue with dropdown menu
2016-08-04 06:04:15 -07:00
Frankie
f8ac9ca522 Fix issue with dropdown menu 2016-08-03 19:43:54 -07:00
Dan Finlay
5b76f6f8ae Merge pull request #508 from MetaMask/FixAccountSelectionBug
Fix account selection bug
2016-07-29 13:31:39 -07:00
Dan Finlay
f9e81bdd99 Version 2.7.3 2016-07-29 13:28:26 -07:00
Dan Finlay
3a489baa71 Bump changelog 2016-07-29 13:28:10 -07:00
Dan Finlay
c9c8fbf2ec Fix account selection updating 2016-07-29 13:27:39 -07:00
Dan Finlay
6d864e82ac Merge pull request #507 from MetaMask/Version2.7.2
Version 2.7.2
2016-07-29 13:11:34 -07:00
Dan Finlay
019581bd1f Version 2.7.2 2016-07-29 13:08:57 -07:00
Dan Finlay
212f9cf945 Merge pull request #506 from MetaMask/FixNetworkReference
Fix network name reference
2016-07-29 13:08:14 -07:00
Dan Finlay
c7691b7e64 Fix reference in drop menu item 2016-07-29 12:22:39 -07:00
Dan Finlay
8a4d8eca64 Fix network name reference
When adding the classic network to the menu, I left a reference to a property that is not always existent, so we needed a fallback for it.
2016-07-29 12:19:15 -07:00
kumavis
591fe3f9be Merge pull request #498 from MetaMask/AddEthClassic
Add eth classic
2016-07-29 11:29:28 +09:00
Dan Finlay
6151339840 Merge branch 'master' into AddEthClassic 2016-07-28 15:47:22 -07:00
Dan Finlay
0b41248743 Merge pull request #500 from MetaMask/FixRemoteStoreBug
Fix broken reference to host store.didUpdate
2016-07-28 13:16:59 -07:00
Dan Finlay
ab320d12b4 Merge branch 'master' into AddEthClassic 2016-07-28 13:11:19 -07:00
Dan Finlay
0aad3216d4 Merge branch 'master' into FixRemoteStoreBug 2016-07-28 13:11:10 -07:00
Dan Finlay
910d326dbd Merge pull request #502 from MetaMask/ParallelCopyTasks
Fix some gulp task issues
2016-07-28 13:10:42 -07:00
Dan Finlay
bdd2752cc7 Fix some gulp task issues
I know, I've been fixing up the gulp scripts all week. I keep fixing one thing then breaking another.

In this commit, I fix some issues with some previous approaches.

I no longer try to do the copying to `chrome` after `firefox`, I simply stream to both during copy and build tasks, and that logic is reused during dev and build tasks.

The `copyTask` function now supports an array of `destinations`, that allows piping to multiple destinations, which is pretty cool.

The `manifest:cleanup` task that chrome requires is now just part of the `copy` task, so we don't have to remember it everywhere we copy. So obvious it's like why only now.
2016-07-28 12:59:37 -07:00
Dan Finlay
5fdf375751 Merge pull request #501 from MetaMask/UpdateNodeDependency
Update readme node version
2016-07-28 12:23:12 -07:00
Dan Finlay
4715a55d0f Update readme node version 2016-07-28 11:58:37 -07:00
Dan Finlay
5ceed48db9 Fix broken reference to host store.didUpdate
I'd returned this line because it seemed to fix Firefox compatibility, now it seems like that wasn't the case.  Removing it again.
2016-07-28 11:53:33 -07:00
Dan Finlay
da58125c5e Merge branch 'master' into AddEthClassic 2016-07-28 11:11:13 -07:00
Dan Finlay
c805963a22 Linted 2016-07-28 11:10:54 -07:00
Dan Finlay
496b6b6e96 Merge pull request #499 from MetaMask/FixDevScripts
Fix dev tasks for multi browser copying
2016-07-28 11:08:31 -07:00
Dan Finlay
5feff0b1f5 Add missing reference for provider 2016-07-28 11:04:02 -07:00
Dan Finlay
5d83b9176b Bump changelog 2016-07-28 10:54:25 -07:00
Dan Finlay
51535ab0cc Fix margin on provider checkmarks 2016-07-28 10:54:00 -07:00
Dan Finlay
9b43ec2278 Add eth classic to provider menu 2016-07-28 10:53:51 -07:00
Dan Finlay
daaac17be2 Fix dev tasks for multi browser copying 2016-07-28 10:50:14 -07:00
Dan Finlay
a259dfad25 Merge pull request #497 from MetaMask/FixBuild
Fix nondeterministic build
2016-07-27 17:03:47 -07:00
Dan Finlay
7f00ee43ba Fix nondeterministic build
We used to be able to copy static resources while we built js, but now part of the copy task is copying firefox built files into chrome, so they need to be done in order.

This could probably be optimized a bit more, but for now it builds reliably again.
2016-07-27 16:58:00 -07:00
Dan Finlay
ba21195a49 Merge pull request #496 from MetaMask/Version2.7.1
Version 2.7.1
2016-07-27 16:51:39 -07:00
Dan Finlay
43784e2143 Version 2.7.1 2016-07-27 16:49:11 -07:00
Dan Finlay
482e15c573 Merge pull request #493 from MetaMask/droppo-fix
Droppo fix
2016-07-27 01:29:01 -07:00
Kevin Serrano
f8f8e78c55 Changelog add. 2016-07-27 15:34:12 +09:00
Kevin Serrano
cf14eb4043 Merge branch 'master' into droppo-fix 2016-07-27 15:32:12 +09:00
Kevin Serrano
3a4744dec1 Fix menu droppo issues caused by Chrome 52. 2016-07-27 15:31:30 +09:00
Dan Finlay
7a8d049732 Merge pull request #492 from MetaMask/FixChromeBuild
Fix chrome build
2016-07-26 17:38:22 -07:00
Dan Finlay
c759bc5871 Correct typo comment 2016-07-26 17:25:15 -07:00
Dan Finlay
32335434e3 Merge branch 'master' into FixChromeBuild 2016-07-26 17:15:36 -07:00
Dan Finlay
0b620026c2 Fix copy task 2016-07-26 17:13:52 -07:00
Dan Finlay
7fe3170c6f Enhance manifest details 2016-07-26 17:02:54 -07:00
Dan Finlay
c6ec3fc714 Cleanup Changelog 2016-07-26 17:02:31 -07:00
Dan Finlay
407d2e884b Merge remote-tracking branch 'origin/Version2.7.0' into FixChromeBuild 2016-07-26 17:01:48 -07:00
Dan Finlay
79ce99db07 Merge pull request #491 from MetaMask/FixChromeBuild
Fix chrome build
2016-07-26 16:51:54 -07:00
Dan Finlay
de5a2bf9bc Fix chrome build 2016-07-26 16:48:48 -07:00