Dan Finlay
3da0d61417
Bump changelog
2016-09-13 12:54:30 -07:00
Frankie
19c1b1fd8e
Merge branch 'master' into qrCode
2016-09-13 12:18:19 -07:00
Dan Finlay
b508541935
Fix cache clearing reference for Opera
...
For some reason Chrome didn't mind this awful bug, but Opera caught it.
2016-09-12 22:13:52 -07:00
Frankie
fc292627e4
Merge branch 'master' into qrCode
2016-09-12 17:30:54 -07:00
Frankie
09bd35ac7a
Add to CHANGELOG.md
2016-09-12 17:29:54 -07:00
Dan Finlay
ebf86f930a
Version 2.11.0
2016-09-12 15:45:32 -07:00
Frankie
c37c050c8a
Revert "Add new eth-lightwallet salting to vault."
2016-09-12 10:34:06 -07:00
Dan Finlay
03168c6b91
Bump changelog
2016-09-09 19:52:37 -07:00
Kevin Serrano
5e38f48f41
Update changelog
2016-09-09 14:24:16 -07:00
Kevin Serrano
2ede90eee3
Merge branch 'i610-InitOneWalletOnly' of github.com:MetaMask/metamask-plugin into i610-InitOneWalletOnly
2016-09-09 09:50:45 -07:00
Dan Finlay
7b6c018c39
Show loading indication during unlocking.
2016-09-08 19:53:54 -07:00
Dan Finlay
2f98d5bc0f
Bump changelog
2016-09-08 19:50:55 -07:00
Frankie
3f64095eed
Merge branch 'i#589pendingTxsIssue' of https://github.com/MetaMask/metamask-plugin into i#589pendingTxsIssue
2016-09-08 14:56:19 -07:00
Frankie
ece1ecb90b
Fix wording in changelog and bug
2016-09-08 14:53:49 -07:00
Frankie
079c1a8972
Merge branch 'master' into i#589pendingTxsIssue
2016-09-08 13:45:27 -07:00
Frankie
7d8491de10
Add to CHANGELOG.md and Remove unnecessary catch
2016-09-08 13:13:43 -07:00
Dan Finlay
a1e9b951ac
Bump changelog
2016-09-08 12:51:14 -07:00
Dan Finlay
2ca58f5bf7
Merge branch 'master' into ModularFiatBalance
2016-09-06 19:36:40 -07:00
Dan Finlay
2564c0c51c
Bump changelog
2016-09-06 18:59:47 -07:00
Dan Finlay
e75a1d63f7
Bump changelog
2016-09-06 17:31:24 -07:00
Kevin Serrano
01618a88aa
Update changelog and merge master.
2016-09-06 15:30:30 -07:00
Kevin Serrano
41632114c0
Add to changelog.
2016-09-06 10:25:14 -07:00
Kevin Serrano
831ed15777
Merge branch 'master' into livereload
2016-09-02 14:16:13 -07:00
Kevin Serrano
068bd7d40a
Merge branch 'master' into livereload
2016-09-02 14:15:24 -07:00
Kevin Serrano
f9f821e726
Changelog add.
2016-09-02 14:15:15 -07:00
Kevin Serrano
2d0077d5c6
Changelog add and rename vars.
2016-09-02 14:15:00 -07:00
kumavis
c2a1b442e9
Version 2.10.2
2016-09-02 13:51:22 -07:00
kumavis
8b37bcf16b
Version 2.10.1
2016-09-02 12:48:50 -07:00
Dan Finlay
a6e3357d22
Bump changelog
2016-09-01 11:33:54 -07:00
Dan Finlay
e39513ff18
Bump changelog
2016-08-29 12:37:38 -07:00
Dan Finlay
bb8241f711
Version 2.10.0
2016-08-29 11:14:18 -07:00
Frankie
547894ed39
Merge branch 'master' into i#563forgotPassword
2016-08-25 16:06:54 -07:00
Dan Finlay
8b81009a30
Merge branch 'master' into PopupNotifications
2016-08-25 15:42:35 -07:00
Dan Finlay
ca4127dd5e
Bump changelog
2016-08-25 15:27:19 -07:00
Frankie
11c6c63d76
Merge branch 'master' into i#563forgotPassword
2016-08-25 14:17:29 -07:00
Frankie
df824c0c45
Add to CHANGELOG
2016-08-25 14:16:57 -07:00
Kevin Serrano
a9b390c58c
Bump versioning.
2016-08-24 18:38:15 -07:00
Dan Finlay
793ad6b8d8
Merge branch 'master' into PopupNotifications
2016-08-24 16:59:22 -07:00
Dan Finlay
340d12f0cf
Version 2.9.1
2016-08-24 16:32:15 -07:00
Dan Finlay
eee08457e5
Merge branch 'master' into i484PersistPendingSignatures
2016-08-24 16:15:43 -07:00
Kevin Serrano
06b5e7f527
Merge branch 'master' into api-test-fix
2016-08-24 16:09:51 -07:00
Dan Finlay
15c8680e21
Bump changelog
2016-08-24 16:02:47 -07:00
Dan Finlay
6041d6157a
Bump changelog
2016-08-24 15:43:42 -07:00
Dan Finlay
4e34796983
Merge branch 'master' into PopupNotifications
2016-08-24 15:03:09 -07:00
Kevin Serrano
e42b35398b
Changelog change.
2016-08-24 13:28:31 -07:00
Kevin Serrano
c27ad468d1
Clarify shortcut.
2016-08-24 11:24:46 -07:00
Kevin Serrano
cf5b8ba388
Change shortcut again to Ctrl+Alt+M
2016-08-24 11:15:03 -07:00
Kevin Serrano
1444f5451f
Change shortcut to Alt+M
2016-08-24 10:25:59 -07:00
Kevin Serrano
2a9b271703
Update changelog.
2016-08-23 16:54:25 -07:00
Dan Finlay
bc43e3d140
Merge branch 'master' into PopupNotifications
2016-08-23 16:02:06 -07:00
Kevin Serrano
4bceda37a8
Merge branch 'master' into fox-sub
2016-08-23 14:51:09 -07:00
Kevin Serrano
050d0aecc6
Changelog.
2016-08-23 14:32:47 -07:00
Dan Finlay
49ab51d825
Merge branch 'master' into PopupNotifications
2016-08-22 20:06:59 -07:00
Dan Finlay
642e84da6c
Merge master
2016-08-22 15:04:13 -07:00
Dan Finlay
6e1000f361
Merge branch 'master' into PopupNotifications
2016-08-22 15:03:36 -07:00
Dan Finlay
f57cbe59fc
Removed view more button, added account info button.
...
Also:
- Also fixed bug that caused React warning when rendering the tx history.
- Renamed 'Transactions' to 'History', since it now has more than that.
2016-08-22 14:36:21 -07:00
Dan Finlay
3d451ddf3e
Merge branch 'master' into i390-TransactionLimit
2016-08-22 11:59:08 -07:00
Dan Finlay
31e0a3491b
Version 2.9.0
2016-08-22 11:24:34 -07:00
Dan Finlay
8592ffd855
Merge branch 'master' into i390-TransactionLimit
2016-08-19 07:57:35 -07:00
Dan Finlay
9cd85aea2f
Merge branch 'master' into shapeshiftTx
2016-08-19 07:50:57 -07:00
Frankie
e3e5538ddc
Remove "+" from shapeshift tx and change wording in CHANGELOG
2016-08-18 20:24:17 -07:00
Frankie
98dab0ffd2
Make ballance teal for shapeshift tx and add to change log
2016-08-18 16:30:13 -07:00
Dan Finlay
bd9d89826c
Added view more
button to transaction list
...
Visible at the end of the transaction list, or if no transactions are listed, displayed right after the `No Transactions` message.
2016-08-18 16:23:12 -07:00
Kevin Serrano
d53b056425
Bump changelog.
2016-08-18 16:04:51 -07:00
Dan Finlay
270dbacbc4
Bump changelog
2016-08-16 17:52:38 -07:00
Kevin Serrano
7d40f29993
Add to changelog.
2016-08-16 14:13:18 -07:00
Dan Finlay
e5f2c1a866
Version 2.8.0
2016-08-15 10:56:01 -07:00
Dan Finlay
e826eb932c
Remove ethereum classic provider
...
Fixes #542
2016-08-14 18:41:05 -07:00
Frankie
31d6d5c509
Add to change log
2016-08-13 13:48:49 -07:00
kumavis
7dcb3c64df
changelog - add note about web3-provider-stream fix
2016-08-11 14:42:02 -07:00
Kevin Serrano
f42723c903
Add to changelog.
2016-08-04 11:24:25 -07:00
Dan Finlay
3a489baa71
Bump changelog
2016-07-29 13:28:10 -07:00
Dan Finlay
019581bd1f
Version 2.7.2
2016-07-29 13:08:57 -07:00
Dan Finlay
6151339840
Merge branch 'master' into AddEthClassic
2016-07-28 15:47:22 -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
5d83b9176b
Bump changelog
2016-07-28 10:54:25 -07:00
Dan Finlay
43784e2143
Version 2.7.1
2016-07-27 16:49:11 -07:00
Kevin Serrano
f8f8e78c55
Changelog add.
2016-07-27 15:34:12 +09: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
2368c2993d
Add platform specific builds and zip tasks ( #486 )
...
* Add platform specific folders to dist folder
* Remove gulp hacks
* Add platform specific bundling
dev and dist tasks now build into platform-specific folders within the `dist` folder.
Added tasks `gulp zip` and `gulp dist`.
`zip` builds the platform-specific folders into platform-specific bundles within the `dist` folder.
`dist` builds and then zips all at once.
* Fix chrome bundle zipping
* Fix broken reference in eth warning
* Fix but where web3.eth.accounts are not available in firefox.
* Bump changelog
2016-07-26 15:15:40 -07:00
Dan Finlay
0eb7354c1a
Bump changelog
2016-07-25 17:51:28 -07:00
Kevin Serrano
0bbfedc2bf
Manifest fix for firefox-specific field ( #475 )
...
* Remove firefox-only manifest.json line.
* Changelog change.
2016-07-21 16:50:51 -07:00
Dan Finlay
5d93e8fa74
Version 2.7.0
2016-07-21 13:42:09 -07:00
Frankie
fcd523abe4
Buy button ( #474 )
...
* WIP: Buy button link
* Add buy eth and the buy eth warning message
* Add css
* Move the opening of coinbase page to background
and send to faucet if on test net
* Create a Warning about storeing eth
* Finish Buy button and Eth store warning screen
* Add to CHANGELOG
* fix frankies deletion and change chrome to extension
2016-07-21 13:41:10 -07:00
Dan Finlay
cdd7e40545
Make injected web3 fail hard on sync methods ( #471 )
...
Make injected web3 fail hard on sync methods
2016-07-20 14:54:07 -07:00
Dan Finlay
5567ea8dc5
Version 2.6.2 ( #470 )
2016-07-20 10:16:18 -07:00
Kevin Serrano
1d8d8384c6
Update Changelog to account for last PR
2016-07-18 12:25:17 -07:00
Dan Finlay
2697e1ba95
Bump changelog
2016-07-15 17:53:31 -07:00
Dan Finlay
3b80a043ee
Version 2.6.1 ( #442 )
2016-07-14 00:11:49 -07:00
kumavis
97e38b4983
new tx - calculate estimatedGas and show thing in tx-details ( #441 )
...
* new tx - calculate estimatedGas and show thing in tx-details
* Bump changelog
2016-07-13 23:39:44 -07:00
Frankie
dbc9008295
Fix eth balance tooltip to show 6 decimals ( #440 )
...
* Fix tooltip to show to the 6 decimal place on balances ovr 0...
* Change font size for balance component in tx-list so it fits the notation
* Add to change log
* Linting
* change log
2016-07-13 15:46:36 -07:00
Kevin Serrano
ad803125cb
Bump provider-engine from 7.8.1 to 7.8.3 ( #435 )
...
* Bump provider-engine from 7.8.1 to 7.8.3
* Modify changelog.
2016-07-13 12:04:46 -07:00
Kevin Serrano
1f347c22b0
Update changelog.
2016-07-12 12:08:56 -07:00
Dan Finlay
57da5a8198
Merge branch 'master' into FixSvgIcons
2016-07-11 20:55:58 -07:00
Dan Finlay
539fe3e940
Fix svg icon in notification
2016-07-11 20:44:56 -07:00
Kevin Serrano
38225ac8f5
Merge branch 'master' into balance-refactor
2016-07-11 17:54:16 -07:00
Kevin Serrano
a72aad19c8
Update changelog.
2016-07-11 17:45:20 -07:00
Dan Finlay
a446be2397
Version 2.6
2016-07-11 15:54:32 -07:00
Kevin Serrano
86b7cc6637
Resolve merge conflict.
2016-07-07 16:33:06 -07:00
Kevin Serrano
f26c47a3fc
Modify changelog.
2016-07-07 16:28:40 -07:00
kumavis
ac808e681f
Merge branch 'master' of github.com:MetaMask/metamask-plugin into ConfirmationStyle
2016-07-07 15:04:53 -07:00
Kevin Serrano
ecb0f9767b
Add new test state with tx history. Fix alignment issue with transaction history text.
2016-07-07 13:48:52 -07:00
Dan Finlay
28617d8710
Bump changelog
2016-07-06 22:57:00 -07:00
kumavis
d892fffce2
Merge branch 'master' of github.com:MetaMask/metamask-plugin into fastinject
2016-07-06 20:52:28 -07:00
kumavis
ec5adf014e
changelog - add web3 min dist
2016-07-06 20:22:20 -07:00
Kevin Serrano
acdd40e3be
Fix dropdown z-index issue.
2016-07-06 20:11:49 -07:00
Frankie
53eefc1efc
Add a postion option for tool tip
2016-07-06 17:12:33 -07:00
Kevin Serrano
04c4dad890
Add to changelog.
2016-07-05 12:08:08 -07:00
Dan Finlay
76c473538a
Version 2.5.0
2016-07-01 20:15:27 -07:00
Frankie
8465be340a
Add to CHANGELOG
2016-06-30 14:57:17 -07:00
Dan Finlay
db3f73344b
Bump changelog
2016-06-30 11:42:10 -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
2b5c42d27f
Merge branch 'master' into CopyTxHash
2016-06-29 15:58:31 -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
Dan Finlay
57c8922817
Bump changelog
2016-06-29 14:40:13 -07:00
Dan Finlay
757a3ce6be
Version 2.4.5
2016-06-29 13:53:37 -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
661d9bffb3
Changelog update and reduce allowed characters from 30 to 20.
2016-06-28 13:10:29 -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
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
Dan Finlay
cbcc0438cb
Bump changelog
2016-06-24 11:26:17 -07:00
kumavis
2437284515
2.4.4
2016-06-23 12:56:14 -07:00
Frankie
973aa4fd15
close #309
2016-06-22 16:35:34 -07:00
Frankie
b3b4983831
Add to change log
2016-06-22 15:49:17 -07:00
Dan Finlay
73869ea233
Version 2.4.2
2016-06-22 11:06:06 -07:00
Dan Finlay
856a7c84cd
Bump changelog
2016-06-21 17:21:55 -07:00
Frankie
c152f98735
Add to changelog
2016-06-21 15:08:24 -07:00
Dan Finlay
d19c286ee8
Version 2.4.0
2016-06-20 15:36:47 -07:00
Dan Finlay
451be3b10e
Merge branch 'master' into SignFullDataNotHash
2016-06-16 17:34:44 -07:00
Dan Finlay
65f9f997b0
Bump changelog
2016-06-16 17:22:26 -07:00
Dan Finlay
fe83a19c08
Update changelog
2016-06-16 11:48:02 -07:00
Dan Finlay
6ee45a742d
Bump changelog
2016-06-14 15:42:40 -07:00
Dan Finlay
f599f9ad29
Bump changelog
2016-06-14 15:27:15 -07:00
Dan Finlay
d34b7033ef
Bump changelog
2016-06-14 15:01:58 -07:00
Frankie
0384f0cb0f
Write to CHANGELOG
2016-06-12 13:38:16 -04:00
Dan Finlay
5efef31381
Version 2.3.1
2016-06-12 13:38:16 -04:00
Frankie
03e9ff6e42
Mend CHANGE.log
2016-06-08 17:12:25 -04:00
Frankie
e9407777cc
Style up the info screen
2016-06-08 16:43:05 -04:00
Dan Finlay
d5c378b09a
Cache identicons
...
Fixes #197
Also as a side effect, by creating this `iconFactory.cache` object, we have a convenient place for specifying stock icons for known contracts!
We can just hard-code image addresses in the `ui/lib/icon-factory.js` cache instantiation, and those values will be injected into the identicon image tag `src` attributes.
2016-06-06 14:05:13 -07:00
Dan Finlay
8dcba9a606
Version 2.3.0
2016-06-06 11:22:04 -07:00
Dan Finlay
b9007ee843
Add provider menu on clicking network status indicator.
...
Also simplifies network status icons.
2016-06-03 17:49:54 -07:00
Dan Finlay
b2b4b4dd25
Merge branch 'master' into display_network
2016-06-03 15:21:24 -07:00
Dan Finlay
9cc04be5e4
Added seed word recovery to config screen
2016-06-02 16:52:18 -07:00
Dan Finlay
01e63d41ed
Version 2.2.0
2016-06-02 11:47:31 -07:00
Dan Finlay
b81b3048c5
Bump provider engine version
2016-06-02 11:46:35 -07:00
Zac Mitton
924a65c956
network status getting set upon start-up and showing in title bar but not auto-updating yet
2016-06-01 16:30:14 -07:00
Dan Finlay
921ced1630
Merge branch 'master' into i216
2016-05-26 15:21:27 -07:00
Dan Finlay
73ad717392
Bump changelog
2016-05-26 15:21:04 -07:00
Dan Finlay
f69721a98d
Bump changelog
2016-05-26 14:34:04 -07:00
Dan Finlay
7f4929a2d2
Bump version
2016-05-26 10:15:01 -07:00
Dan Finlay
d8c4af5f2b
Update eth-lightwallet for security fix
2016-05-26 10:13:05 -07:00
Dan Finlay
e8eae89576
Merge branch 'master' into FixTransactionBackButton
2016-05-25 17:57:57 -07:00
Dan Finlay
5669f44300
Add number indicating pending txs to account list
2016-05-25 16:54:43 -07:00
Dan Finlay
2683d1f43e
Bump changelog
2016-05-25 15:51:37 -07:00
Dan Finlay
d5e4ceb09e
Bump changelog
2016-05-23 15:31:41 -07:00
Dan Finlay
33f9aabf3e
Version 2.0.0
2016-05-23 12:34:01 -07:00
Dan Finlay
8efd30ad7a
Bump changelog
2016-05-20 16:30:30 -07:00
Dan Finlay
4386fdd097
Bump changelog
2016-05-20 12:53:53 -07:00
Dan Finlay
60270de53d
Add full precision to send tx value field.
2016-05-19 14:46:50 -07:00
Dan Finlay
c1dd33a5df
Bump changelog
2016-05-19 12:07:25 -07:00
kumavis
dd46ce79fd
Merge branch 'master' into eyeballs
2016-05-13 18:15:07 -07:00
kumavis
7f77fe1a79
Version 1.8.4
2016-05-13 18:09:36 -07:00
Dan Finlay
e29bac12b8
Move infura rpcs to https
2016-05-13 15:29:58 -07:00
Dan Finlay
f2676d1241
Merge branch 'master' into eyeballs
2016-05-13 00:20:40 -07:00
kumavis
57d6ad2a3c
Version 1.8.3
2016-05-12 03:03:27 -07:00
Dan Finlay
4e9b829179
Merge branch 'master' into eyeballs
2016-05-11 14:16:53 -07:00
Dan Finlay
c7a491d7ac
Version 1.8.2
2016-05-11 13:54:46 -07:00
Dan Finlay
8bfa40d2d3
Move all users to new scalable backend
2016-05-11 13:10:54 -07:00
Dan Finlay
b430cbd064
Fix send view selected account bug
2016-05-11 12:54:19 -07:00
Dan Finlay
0e6b62a924
Bump changelog
2016-05-11 02:50:12 -07:00
Dan Finlay
39403eb794
Version 1.8.1
2016-05-10 15:45:46 -07:00
Dan Finlay
d8bee4f599
Make default providers more easiliy configurable for metamask devs
...
No longer do our `mainnet` and `testnet` buttons set specific RPC urls. Now they set `provider.type`, which gets interpreted with code.
Currently the provider types of `mainnet` and `testnet` point to our new scalable backends, but these could be re-interpreted to use any other provider, be it etherscan, peer to peer, or otherwise.
Makes it easier for us to upgrade our infrastructure without incorporating migration logic into the program.
2016-05-10 15:37:13 -07:00
Dan Finlay
366f45d461
Version 1.8.0
2016-05-10 10:48:46 -07:00
Dan Finlay
356da540d1
Style transaction list using new panel component
2016-05-06 14:42:08 -07:00
Dan Finlay
edf4e2bc5b
Bump changelog for automatic reload on provider change
2016-05-06 11:38:44 -07:00
Dan Finlay
ebb0aac7dd
Always show transaction list
2016-05-05 13:27:00 -07:00
Dan Finlay
f92189a721
Restored back button to account detail view.
...
The `Change Acct` button was confusing multiple users, reverted that bit.
2016-05-05 12:14:51 -07:00
Dan Finlay
cad9a5e6e9
Bump changelog
2016-05-04 20:44:47 -07:00
Dan Finlay
37dc13ce3b
Bump changelog
2016-05-04 18:18:58 -07:00
Dan Finlay
46e100f595
Improve tx UI
2016-05-03 14:44:36 -07:00
Dan Finlay
dcbf17af2d
Clarified user value for UMD fix on changelog
2016-04-29 17:57:07 -07:00
Dan Finlay
fcab161890
Version 1.7.0
2016-04-29 17:20:38 -07:00
Dan Finlay
988165224b
Fix outdated transitions
...
Fixes #151
- Cancelling or completing a tx now goes back to account detail view.
- Restoring a vault now does not select an unloaded account, shows account list.
- Account list now never selects an item only uses the cells as buttons.
2016-04-29 17:02:36 -07:00
Dan Finlay
8421c97db2
Bumped changelog for transaction list enhancements
2016-04-29 17:02:26 -07:00
kumavis
62e4cc8e67
add changelog note for inpage context guard
2016-04-29 15:42:48 -07:00
Dan Finlay
118da12197
Merge branch 'master' into Identicon
2016-04-29 14:01:58 -07:00
Dan Finlay
9360e33510
Convert icons to identicons
2016-04-29 12:45:46 -07:00
Dan Finlay
a5d024c7d2
Bump changelog
2016-04-29 12:15:50 -07:00
Dan Finlay
82ac8bde5d
Bump changelog
2016-04-25 14:16:07 -07:00
Dan Finlay
88ed546a9a
Bump changelog
2016-04-25 13:49:53 -07:00
Dan Finlay
652c1d96c1
Bump version
2016-04-22 15:25:56 -07:00
Dan Finlay
081a943d9b
Resolve changelog order conflict
2016-04-22 14:48:10 -07:00