44 commits

Author	SHA1	Message	Date
David Kelly	67f25adac0	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-29 08:02:53 -07:00
David Kelly	a7af114144	fix wallet, use text from server in history (for now)	2017-08-28 17:04:19 -07:00
Zach Fox	22d3857501	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory	2017-08-28 15:10:17 -07:00
Zach Fox	1c1b841a86	Fix security images; actually do the right thing when wallet not set up	2017-08-28 12:18:53 -07:00
David Kelly	b942faa60e	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-25 14:16:31 -07:00
David Kelly	5bbe3c5a94	Merge pull request #11246 from davidkelly/dk/encryptionBug ... security image bug	2017-08-25 14:14:22 -07:00
David Kelly	f015ac3c68	get transaction history into qml	2017-08-25 13:55:38 -07:00
Zach Fox	e606e3dfb3	Squashed commit of the following: ... commit 453897b9e2 Author: Zach Fox <fox@highfidelity.io> Date: Fri Aug 25 10:56:53 2017 -0700 Huge cleanup!	2017-08-25 11:45:37 -07:00
David Kelly	0f722992a5	add delete to client of decryptFile	2017-08-25 11:24:37 -07:00
Zach Fox	453897b9e2	Huge cleanup!	2017-08-25 10:56:53 -07:00
David Kelly	c316e50f0f	security image bug	2017-08-25 10:29:40 -07:00
David Kelly	d398adc195	warnings	2017-08-24 08:48:26 -07:00
David Kelly	c77dafdf12	fix warnings, prepare a bit for hooking up the passphrase	2017-08-23 17:43:37 -07:00
David Kelly	138534c3ff	encrypt security image	2017-08-23 15:01:09 -07:00
David Kelly	8bb7ea900a	Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile	2017-08-22 16:23:23 -07:00
David Kelly	0bd3f1728d	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile	2017-08-22 14:40:10 -07:00
Zach Fox	f1da7a6381	Checkpoint	2017-08-22 11:53:37 -07:00
Zach Fox	512a08f67f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp	2017-08-18 17:05:56 -07:00
David Kelly	1904bd3f2b	encrypting image, rough first pass, lots left	2017-08-18 16:14:10 -07:00
howard-stearns	29b717e22d	remove dead code	2017-08-18 14:08:04 -07:00
howard-stearns	3d401129fb	checkpoint	2017-08-18 10:03:00 -07:00
Zach Fox	ccf81f801d	All the pieces!	2017-08-17 17:06:48 -07:00
Zach Fox	9135e37078	Go go go go gog o	2017-08-17 15:20:17 -07:00
Zach Fox	eab16fc28c	Initial progress	2017-08-17 15:01:25 -07:00
David Kelly	73e943daaf	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys	2017-08-16 10:13:08 -07:00
Zach Fox	b7282cc776	Lots of fixes	2017-08-15 13:46:20 -07:00
Zach Fox	528d2072f9	Bugfixes and improvements	2017-08-15 12:14:32 -07:00
David Kelly	0f7db74ef1	missed a couple warnings	2017-08-15 11:44:15 -07:00
Zach Fox	bddce9328b	V1	2017-08-15 11:08:03 -07:00
David Kelly	a6390edf46	ugh	2017-08-15 10:10:48 -07:00
David Kelly	c08fce967f	forgot a warning	2017-08-15 08:58:16 -07:00
David Kelly	ef5863d169	warnings squashed	2017-08-14 16:24:50 -07:00
David Kelly	170d2b186b	url encode the base64 signature/key	2017-08-14 13:48:09 -07:00
David Kelly	803a5c6690	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys	2017-08-14 13:15:04 -07:00
David Kelly	b4b592cc00	one key file with (for now) both public and private keys in there	2017-08-14 12:53:10 -07:00
Zach Fox	199ba3bff0	Use new JSON inventory format	2017-08-14 11:55:21 -07:00
David Kelly	f784bc42de	Initial cut using RSA keys for now	2017-08-11 16:54:04 -07:00
howard-stearns	551ea921cd	Make API asynchronous, for communicating with server	2017-08-11 11:45:40 -07:00
howard-stearns	8f0fd10e2b	fix	2017-08-10 12:51:05 -07:00
howard-stearns	ca13d58b0b	blance and inventory stubs	2017-08-10 12:44:50 -07:00
howard-stearns	f1ab91edd1	PR feedback	2017-08-09 12:41:16 -07:00
howard-stearns	7414bf0d9a	oops. didn't test what I thought I did	2017-08-09 12:09:03 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
howard-stearns	9bad26c2db	stub files	2017-08-07 12:51:30 -07:00