86 commits

Author	SHA1	Message	Date
Stephen Birarda	e90ea82ef5	move AddressManager to NodeList thread, fix AccountManager invokes	2018-06-27 11:41:37 -07:00
howard-stearns	348d5fc359	inventory text filter	2018-06-07 17:01:48 -07:00
Zach Fox	0021af8714	Merge in in-progress changes from old commerce_paginationAndFiltering branch	2018-05-16 12:28:52 -07:00
Zach Fox	154d70866f	It's working	2018-05-16 12:17:17 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
Zach Fox	0504220171	Abide by new backend code	2018-04-16 13:01:31 -07:00
Zach Fox	ffab27d442	Commerce: Fix Certificate Info error	2018-04-10 15:54:55 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Zach Fox	bf48ecda6d	Fix cert location for content sets	2018-03-26 14:48:05 -07:00
Zach Fox	f42255f46b	Merge branch 'master' of github.com:highfidelity/hifi into commerce_upgrades_1	2018-03-13 13:42:42 -07:00
Zach Fox	22f18dbf56	Don't hit certain Commerce backend endpoints when wallet isn't yet auth'd	2018-03-08 13:12:13 -08:00
Zach Fox	d71fc22ed8	Support argument to available_updates endpoint	2018-03-07 14:06:29 -08:00
Zach Fox	35b23cc954	It's working!	2018-03-05 15:54:17 -08:00
Zach Fox	4046c873bd	Still need to send correct thing to metaverse	2018-03-05 11:24:59 -08:00
Zach Fox	f10f9aa939	Continued progress	2018-03-05 10:01:40 -08:00
howard-stearns	5e78de61ee	remove debugging	2018-02-25 15:24:08 -08:00
howard-stearns	300f611c47	working, with soft reset	2018-02-25 14:06:06 -08:00
howard-stearns	f66e688f41	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-23 16:12:41 -08:00
howard-stearns	1aaae94cc1	checkpoint	2018-02-22 17:04:27 -08:00
Zach Fox	5a8b8d4ac8	Lots of changes	2018-02-14 16:44:02 -08:00
Zach Fox	1b7253dc7f	Already Owned endpoint	2018-02-13 13:54:50 -08:00
David Kelly	844ec6a863	eliminate dash in history, replace with 0 HFC	2018-01-18 16:02:40 -08:00
David Kelly	21cc6ee8dd	fix marketplace txn display (memo only)	2018-01-18 14:28:25 -08:00
David Kelly	2b7576cef5	Merge branch 'master' of github.com:highfidelity/hifi into dk/placesInHfcTransferHistory	2018-01-18 13:00:07 -08:00
David Kelly	9a523ead31	fix link	2018-01-18 12:44:45 -08:00
David Kelly	2cdbc1159e	nearby hfc transfers should send the location too	2018-01-18 11:15:32 -08:00
David Kelly	c661bec8fd	whitespace	2018-01-17 17:15:14 -08:00
David Kelly	1dde25e38f	Don't make links in txn history for highfidelity and marketplace	2018-01-17 16:51:38 -08:00
Zach Fox	5ce768f402	Merge pull request #12151 from zfox23/commerce_sendMoney1 ... Commerce: P2P Transfer Iteration 1	2018-01-17 16:41:56 -08:00
Zach Fox	16d51986a9	Make the call to receiveAt more robust	2018-01-17 15:11:58 -08:00
Zach Fox	e700ff91d0	Remove warning	2018-01-16 15:58:17 -08:00
David Kelly	929760c226	fix time display	2018-01-16 14:52:26 -08:00
David Kelly	d8f8f9ff1a	First cut at alan's new design	2018-01-16 11:19:10 -08:00
David Kelly	6cedc016c4	Adding sender/recipient to transaction history for hfc transfers	2018-01-12 16:08:52 -07:00
David Kelly	579a4d85b3	Merge branch 'commerce_sendMoney1' of https://github.com/zfox23/hifi into dk/senderAndRecipientInTxnHistory	2018-01-12 14:37:46 -07:00
Zach Fox	81ab5ac81c	hfc_key -> public_key	2018-01-11 12:50:25 -08:00
howard-stearns	c39771d995	do not delete wallet file when things go wrong, and remove obsolete ... reset machinery	2018-01-11 11:50:23 -08:00
Zach Fox	939012a2d0	Hook up the endpoints!	2018-01-10 17:10:05 -08:00
Zach Fox	edf25c3e4e	Remove code duplication...	2018-01-09 14:14:54 -08:00
Zach Fox	d31dec7acb	Fix unix build errors	2018-01-09 12:41:56 -08:00
Zach Fox	360a7cc4c6	CR feedback	2018-01-09 11:08:18 -08:00
Zach Fox	dcfceab078	Remove all work done on paginating purchases	2018-01-08 12:03:56 -08:00
Zach Fox	cdd62c7119	I don't think auto-refresh and pagination of inventory is possible	2018-01-08 11:29:41 -08:00
Zach Fox	4232bc0200	Bump per_page to 100	2018-01-04 14:42:05 -08:00
Zach Fox	14447c26a0	Prevent visual data loss	2018-01-04 13:47:31 -08:00
Zach Fox	10d494b51d	Pagination for Recent Activity	2018-01-04 12:32:30 -08:00
Zach Fox	73eb258e79	IT'S WORKING!!!	2017-12-21 15:17:52 -08:00
Zach Fox	e963673409	Progress?	2017-12-21 14:08:18 -08:00
Stephen Birarda	139976d8bb	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22:08 -08:00
howard-stearns	07d52306c4	consolidated blockchain history log	2017-11-19 22:51:36 -08:00