203 Commits

Author	SHA1	Message	Date
Frankie	7d8491de10	Add to CHANGELOG.md and Remove unnecessary catch	2016-09-08 13:13:43 -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