229 commits

Author	SHA1	Message	Date
Stephen Birarda	b5254f1ea5	cleanup race on deleteLater after callback processed	2018-06-27 11:41:37 -07:00
Stephen Birarda	e90ea82ef5	move AddressManager to NodeList thread, fix AccountManager invokes	2018-06-27 11:41:37 -07:00
Zach Fox	7a5d794505	Fix MS16113: Use alternate method for creating backup instructions	2018-06-25 14:40:54 -07:00
Zach Fox	7fbc7bf1a5	Merge pull request #13347 from zfox23/MS15721_deleteApp ... Fix MS15721: Delete app.json if installed script isn't running	2018-06-11 13:28:05 -07:00
howard-stearns	ce322a4794	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-08 15:33:07 -07:00
John Conklin II	bc3edbc7fc	Merge pull request #13333 from zfox23/MS15681_securityImageProviderCrash ... Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider	2018-06-08 15:14:32 -07:00
howard-stearns	210cb23de6	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-08 14:54:15 -07:00
Zach Fox	95faad23e2	Merge pull request #13329 from zfox23/MS15664_15663_fixWalletAuthStep ... Fix MS15663/15664: Don't set Wallet Status to 'ready' too early	2018-06-08 14:20:21 -07:00
Zach Fox	d4a19e7bc9	Fix MS15721: Delete app.json if installed script isn't running	2018-06-08 10:52:14 -07:00
howard-stearns	348d5fc359	inventory text filter	2018-06-07 17:01:48 -07:00
howard-stearns	2761688d39	Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll	2018-06-07 16:14:57 -07:00
Zach Fox	c1b971a269	Fix MS15673: Ensure offscreenUI exists before updating SecurityImageProvider	2018-06-07 16:10:44 -07:00
Zach Fox	7d8e02e714	Fix MS15663/15664: Don't set Wallet Status to 'ready' too early	2018-06-07 14:01:52 -07:00
Zach Fox	60aff7a224	Whoops	2018-06-04 14:41:18 -07:00
Zach Fox	7407507f0b	Fix MS15574: Tiny memory leak in Wallet.h	2018-06-04 14:13:25 -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	56ba59681a	Fix MS14741, allowing uninstall of apps whose scripts are no longer running	2018-05-02 16:12:55 -07:00
Zach Fox	cd76336e6a	Actually fix	2018-05-01 09:54:23 -07:00
Zach Fox	f69ee41074	Prevent crash in ImageProvider when tablet isn't yet initialized	2018-04-30 17:13:44 -07:00
Zach Fox	0504220171	Abide by new backend code	2018-04-16 13:01:31 -07:00
Zach Fox	095b4ba5f2	Reduce logging from some Commerce/Discovery features	2018-04-10 16:02:58 -07:00
Zach Fox	b9d0360ea2	Finally fix the grey security pic bug!	2018-04-10 16:00:53 -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
John Conklin II	6969f014fc	Merge pull request #12601 from howard-stearns/clear-wallet-when-picking-a-new-one ... clear wallet when picking a new one	2018-03-09 10:09:41 -08:00
howard-stearns	9d805283d1	clear wallet when picking a new one	2018-03-08 14:24:44 -08: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	30a6cca4b3	Merge branch 'master' of github.com:highfidelity/hifi into end-seeding	2018-02-26 09:26:09 -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	726c1ed816	receiveAt with new key	2018-02-23 17:05:46 -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	53614a1d9f	almost working	2018-02-23 16:12:01 -08:00
Zach Fox	5ee28297f3	Don't use eventLoop, since that will block the UI	2018-02-23 10:19:00 -08:00
howard-stearns	1aaae94cc1	checkpoint	2018-02-22 17:04:27 -08:00
Zach Fox	33f73fef0d	YAY!	2018-02-22 16:26:35 -08:00
Zach Fox	10fa3fa346	It's working!	2018-02-22 16:09:01 -08:00
Zach Fox	de0eee52d6	cool	2018-02-22 14:45:32 -08:00
Zach Fox	4d2d7fa51f	lots of fun initial progress!	2018-02-22 13:56:46 -08:00
Zach Fox	8072372822	Lots of changes	2018-02-15 13:27:13 -08:00
Zach Fox	5a8b8d4ac8	Lots of changes	2018-02-14 16:44:02 -08:00
Zach Fox	0fca843667	Integrate 'alreadyOwned' endpoint	2018-02-14 10:24:34 -08:00