16 commits

Author	SHA1	Message	Date
Zach Fox	e0878e7a3f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_zachsPunchlist2	2017-08-30 11:07:24 -07:00
Zach Fox	f366743be7	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
David Kelly	a2b1cfc7ac	security image shows up in every qml engine now	2017-08-29 17:06:57 -07:00
Zach Fox	453897b9e2	Huge cleanup!	2017-08-25 10:56:53 -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
Zach Fox	f1da7a6381	Checkpoint	2017-08-22 11:53:37 -07:00
David Kelly	1904bd3f2b	encrypting image, rough first pass, lots left	2017-08-18 16:14:10 -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
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	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	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