11 commits

Author	SHA1	Message	Date
Jeremy Kauffman	3a0ffb312a	Revert "Update file structure to follow electron-webpack guidelines"	2017-11-24 16:36:10 -05:00
Igor Gassmann	dbf0fae552	Update file structure to follow electron-webpack guidelines	2017-11-24 11:31:05 -03:00
Igor Gassmann	96d70feb7d	Merge master branch's changes	2017-11-21 16:51:12 -03:00
Liam Cardenas	4ffbf05400	Added currentBalance to props in modal credit intro	2017-11-15 10:40:48 -05:00
Jeremy Kauffman	c33b7df732	increase modal width by 20px, fixes #709	2017-11-07 09:35:49 -05:00
Jeremy Kauffman	b32f3cbafe	default balance to undefined, fixes #534	2017-09-06 15:05:35 -04:00
Jeremy Kauffman	c7522dc0a5	better? ... merging is hard releasable?	2017-08-29 17:42:11 -04:00
Jeremy Kauffman	b07682ef9d	wallet changes ... finish rebase	2017-08-29 17:42:09 -04:00
Jeremy Kauffman	8c012bc087	negative progress	2017-08-29 14:40:30 -04:00
Jeremy Kauffman	31fb723d87	invites basics	2017-08-29 14:40:30 -04:00
Jeremy Kauffman	5bec6accc2	mostly done ... refactor modals and settings, clean-up CHANGELOG	2017-08-18 17:47:30 -04:00