4791 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Jack	4e34f861c9	Merge branch 'development' into jsonrpc	2016-03-15 23:02:06 -04:00
Jack	42df2fe242	update daemon ... convert to jsonrpc, fix a few issues, remove hacky functions	2016-03-14 12:30:22 -04:00
Jimmy Kiselak	7f11da8650	Merge branch 'walletcatchup' into development	2016-03-12 14:59:23 -05:00
Jimmy Kiselak	dff0fcb1fd	ensure the lbryum wallet is caught up before giving the prompt	2016-03-12 14:58:58 -05:00
Jimmy Kiselak	c31d22f996	Merge branch 'metadata' into development	2016-03-12 14:46:31 -05:00
Jimmy Kiselak	14ab2b52e9	create fee field in metadata	2016-03-12 14:42:57 -05:00
Jimmy Kiselak	e91f34f09b	change metadata structure to use sources key	2016-03-12 14:25:46 -05:00
Jimmy Kiselak	6c733f84e9	Merge branch 'stopexceptions' into development	2016-03-12 14:08:42 -05:00
Jimmy Kiselak	71c2cd5065	Merge branch 'stopexceptions'	2016-03-12 14:08:32 -05:00
Jimmy Kiselak	45f9a10bfb	hide exceptions that show up in the dht and due to bad metadata in the blockchain	2016-03-12 14:08:15 -05:00
Jimmy Kiselak	6ad203f767	Merge branch 'docsupdate' into development	2016-03-09 12:26:27 -05:00
Jimmy Kiselak	5bf895eefe	update documentation to reflect using lbryum by default	2016-03-09 12:26:07 -05:00
Jack	5a8f5b14c1	Merge branch 'master' into development	2016-03-08 12:16:34 -05:00
Jack	27ccb37646	update daemon ... check that managed files still exist, if they don’t remove them from the manager	2016-03-08 12:15:49 -05:00
Jack Robison	b4c528f6b5	Merge pull request #18 from lbryio/development ... merge in commit that got left out	2016-03-03 14:05:25 -05:00
Jack Robison	517a255d5a	Merge pull request #17 from lbryio/development ... merge lbryum updates	2016-03-03 14:00:34 -05:00
Jack	d76feeb320	use master branches	2016-03-03 13:55:03 -05:00
Jack	e4f23b3fce	better organize apps	2016-03-03 00:16:51 -05:00
Jack	02d8dc22e9	update daemon ... -notify user when connected to lbrynet -check for updates from status bar app	2016-03-02 18:32:48 -05:00
Jack	2fc3ec7224	update status bar app	2016-03-02 02:00:45 -05:00
Jack	a243ac7a01	fix bug starting daemon from status bar	2016-02-29 15:04:20 -05:00
Jack	6f1ee78623	update daemon	2016-02-29 13:25:47 -05:00
Jack	6633370a34	Merge branch 'development' of https://github.com/lbryio/lbry into development	2016-02-28 23:51:09 -05:00
Jack	a22e29532c	start daemon from status bar	2016-02-28 23:49:37 -05:00
Jimmy Kiselak	96c8d1f68b	Merge branch 'development' of github.com:lbryio/lbry into development	2016-02-28 12:46:29 -05:00
Jimmy Kiselak	4aa3bd56c4	Merge branch 'win32build' into development	2016-02-28 12:45:39 -05:00
Jimmy Kiselak	7d1cf7975a	update win32 setup script to include lbryum	2016-02-28 12:45:21 -05:00
Jack	59d08a92d0	update status bar app	2016-02-27 17:49:49 -05:00
Jack	33c1a002da	update daemon ... only let local user connect to lbrynet-daemon	2016-02-27 13:19:26 -05:00
Jack	8f04d3418a	get channel id from slack for test bot ... in case i accidentally delete the bot conf file again and don’t want to look up the channel id	2016-02-26 11:20:31 -05:00
Jimmy Kiselak	f5b556c6cb	Merge branch 'development'	2016-02-26 11:02:41 -05:00
Jack	a18f3bf08a	disable status bar	2016-02-26 10:59:09 -05:00
Jack Robison	41a0a0c64c	Merge pull request #15 from lbryio/lbryum ... merge updates	2016-02-26 10:41:07 -05:00
Jack	b4c8a317d0	switch branch	2016-02-26 10:39:56 -05:00
Jack Robison	30ac075555	Merge pull request #14 from lbryio/development ... merge updates	2016-02-26 10:29:38 -05:00
Jimmy Kiselak	fcb317ca40	Merge branch 'electrumparity' into development	2016-02-26 01:46:21 -05:00
Jimmy Kiselak	9991f79326	add support for claiming names, abandoning names, and listing claimed names to the LBRYumWallet	2016-02-26 01:45:52 -05:00
Jack	7cf3f8c7cd	fix typo	2016-02-25 17:18:18 -05:00
Jack	eeef183cc6	update lbrynet-daemon	2016-02-25 17:17:07 -05:00
Jack	96bc02c8cb	Merge branch 'development' into lbryum	2016-02-24 16:19:19 -05:00
Jimmy Kiselak	af276a24ed	Merge branch 'development'	2016-02-23 15:48:00 -05:00
Jimmy Kiselak	a92dbae459	Merge branch 'electrum' into development	2016-02-23 15:17:52 -05:00
Jimmy Kiselak	b0bfb5e443	use electrum as default	2016-02-23 15:13:34 -05:00
Jimmy Kiselak	671e6da104	show when the wallet is starting/started	2016-02-22 23:31:07 -05:00
Jack	485be533c9	make lbryum default wallet for daemon ... with optional command line argument —wallet=	2016-02-22 22:32:07 -05:00
Jimmy Kiselak	53ff4cd651	Merge branch 'electruminstall' into development	2016-02-22 18:22:08 -05:00
Jimmy Kiselak	a98c760d93	Merge branch 'electruminstall'	2016-02-22 18:22:00 -05:00
Jimmy Kiselak	9b0c95e37d	make sure the correct version of six gets installed	2016-02-22 18:21:39 -05:00
Jimmy Kiselak	b419b8f642	enable getting the whole claim trie	2016-02-22 14:24:49 -05:00
Jimmy Kiselak	c32f8d0998	implement getblock	2016-02-22 12:18:28 -05:00