21718 commits

Author	SHA1	Message	Date
samcake	f031bf5661	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-31 09:22:19 -07:00
samcake	3a18d09bec	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-31 08:49:12 -07:00
Zach Fox	913618ded5	Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-30 16:13:50 -07:00
David Kelly	962d1fc81d	Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet	2017-08-30 15:30:29 -07:00
Zach Fox	dbb7023fc1	Fix warnings	2017-08-30 15:26:25 -07:00
David Kelly	988ee8c8d1	fix image provider, couple other things	2017-08-30 15:23:54 -07:00
Zach Fox	fdcc149c34	Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-30 13:27:18 -07:00
Zach Fox	17d999e721	Fixes	2017-08-30 13:25:34 -07:00
Zach Fox	580865fa5a	Add skeleton for infinite scroll	2017-08-30 12:54:26 -07:00
Zach Fox	7a7d7f95d7	Polish transaction history and prepare for whatever new design	2017-08-30 12:45:13 -07:00
Zach Fox	fb4b0f60fa	Remove most dependencies on 'onVisibleChanged'	2017-08-30 11:55:29 -07:00
howard-stearns	b8da08ca42	reset wallet	2017-08-30 11:29:43 -07:00
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
Zach Fox	271fcbf8b4	Merge pull request #11271 from davidkelly/dk/securityImageIssue ... security image shows up in every qml engine now	2017-08-30 10:52:48 -07:00
Zach Fox	1b48319a3f	Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 ... Commerce: Zachs Punchlist 01	2017-08-30 10:10:56 -07:00
Chris Collins	47a2e57e26	Merge pull request #10625 from humbletim/21180-C++ ... CR 21180-C++ Camera app -- core changes	2017-08-30 07:20:00 -07:00
Zach Fox	6ee634b90a	Lock overlay on top of security image	2017-08-29 17:19:34 -07:00
druiz17	2a97257698	Merge pull request #11140 from ElderOrb/case6788 ... 6788: You can deselect your current view mode	2017-08-29 17:15:51 -07:00
David Kelly	a2b1cfc7ac	security image shows up in every qml engine now	2017-08-29 17:06:57 -07:00
Zach Fox	5d1170c5d6	Only make message appear after inventory received	2017-08-29 16:17:59 -07:00
Zach Fox	a9c99854f9	Haven't purchased anything yet UI	2017-08-29 15:39:07 -07:00
Zach Fox	c7ad875485	Virtual keyboard and logic	2017-08-29 15:27:53 -07:00
Zach Fox	50241078ae	Buncha punchlist items checked off	2017-08-29 14:30:00 -07:00
beholder	a0a43ebf26	show checkbox or radiobutton dependently on exclusiveGroup presence	2017-08-29 23:23:16 +03:00
Zach Fox	91f4e59f61	Misc fixes. Get started.	2017-08-29 12:33:44 -07:00
David Kelly	84126d8f95	cr feedback	2017-08-29 08:46:13 -07:00
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	0cdef28cfd	Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-28 14:55:18 -07:00
Zach Fox	37b6099f36	Hook up root_file_url	2017-08-28 12:46:01 -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
Zach Fox	ceb38e261d	HMD Keyboard for purchases filterBar	2017-08-28 10:45:08 -07:00
David Kelly	3955624e63	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-28 10:13:21 -07:00
Zach Fox	ea00668725	Again to Another	2017-08-28 10:04:26 -07:00
Zach Fox	67f3b5c027	Remove quantity	2017-08-28 09:58:45 -07:00
Zach Fox	52cb1dd893	Correctly handle non-JSON items	2017-08-28 09:54:51 -07:00
Zach Fox	e293d122b1	Add security image to Checkout and Purchases	2017-08-28 09:33:30 -07:00
samcake	7d8356686c	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-28 09:28:00 -07:00
Sam Gateau	a98d861600	Merge pull request #11242 from SamGondelman/tabletLayer2 ... Web overlays and entities are always non anti-aliased	2017-08-28 09:10:14 -07:00
Sam Gateau	4035478b9a	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-25 18:18:35 -07:00
Zach Fox	4c16366562	Ints aren't floats, silly!	2017-08-25 16:55:50 -07:00
Zach Fox	50f7f91d4e	Close the loop.	2017-08-25 16:49:02 -07:00
Zach Fox	a03f9592c1	Inventory to Purchases	2017-08-25 16:34:48 -07:00
druiz17	06ab8ddbb2	Merge pull request #11251 from elisa-lj11/blocks ... Blocks app accommodates updated Blocks website	2017-08-25 16:32:14 -07:00
Zach Fox	b1378816d5	Revert "MUCH faster filter!" ... This reverts commit 5173774db0.	2017-08-25 16:23:36 -07:00
Zach Fox	5173774db0	MUCH faster filter!	2017-08-25 16:15:07 -07:00
Zach Fox	ee8f5d6e7b	Filter	2017-08-25 16:08:32 -07:00
Zach Fox	d19377d2d4	Saving	2017-08-25 15:56:30 -07:00