109 commits

Author	SHA1	Message	Date
Seth Alves	12b8a77488	in edit.js, convert entity property ID to be a text-field so the data can be copied	2017-02-15 16:29:50 -08:00
Seth Alves	e030a4a518	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-15 15:20:14 -08:00
David Kelly	5184cbe615	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/zoneFilters2	2017-02-15 12:08:55 -07:00
Seth Alves	3a23ec86d5	handles etc work better	2017-02-14 13:57:48 -08:00
humbletim	831bf93500	* refactor ScriptCache per FIXMEs ... * include error details in BatchLoader results * update EntityServerScript properties in edtior to reflect more granular statuses * ScriptEngine plumbing in prep for require/module integration	2017-02-11 04:47:31 -05:00
David Kelly	61e558e568	Entity Edit Filters for zones ... Part 1 - just put them in the zones entities. Next I'll hook them up and actually filter...	2017-02-08 09:53:25 -07:00
Brad Hefta-Gaub	5ada689ab7	Merge pull request #9497 from ctrlaltdavid/fix-clara-download ... Fix intermittent Clara.io download crashes	2017-01-26 10:58:27 -08:00
Atlante45	f540c94113	Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr	2017-01-25 13:06:49 -08:00
David Rowe	dcd632013f	Better variable name	2017-01-25 16:37:35 +13:00
David Rowe	7e56d0fae6	Fix up Clara.io error handling	2017-01-25 16:36:06 +13:00
David Rowe	1b05ae8a82	Make handling of Clara.io download-ready state transition more robust	2017-01-25 11:00:07 +13:00
Atlante45	a1962e274d	Fix rescale for 0.x values	2017-01-23 14:35:16 -08:00
Ryan Huffman	7cd19192d9	Remove dead code in entityProperties.js	2017-01-19 15:00:30 -08:00
Ryan Huffman	c015ac1bd5	Add display of server script status to edit.js	2017-01-19 13:27:44 -08:00
Ryan Huffman	71e039951c	Add reload server scripts button to edit.js	2017-01-17 14:47:57 -08:00
Ryan Huffman	142c7da523	Add serverScripts property support to edit.js	2017-01-17 14:47:06 -08:00
David Rowe	a1fe908380	Remove a lingering line of old code	2017-01-17 12:56:56 +13:00
David Rowe	d7ab7316a8	Tidying	2017-01-13 12:28:53 +13:00
David Rowe	6f2386eabd	Fix processing of Clara.io status messages	2017-01-13 11:20:00 +13:00
David Rowe	4dee0efdd3	Use more reliable Clara.io API parameters	2017-01-13 09:12:49 +13:00
David Rowe	d45e6f00cb	Prepare only one download at a time	2017-01-12 22:35:42 +13:00
David Rowe	288c069687	Make cancelling downloads more robust	2017-01-12 22:31:09 +13:00
David Rowe	6e622b3719	Don't request model be centered as work-around for downloads failing	2017-01-12 21:35:24 +13:00
David Rowe	cbe8ce0c19	Improve handling of zip file generation failing	2017-01-12 21:33:32 +13:00
David Rowe	37da800a14	Display Clara model preparation progress	2017-01-12 15:47:41 +13:00
David Rowe	9bdcdf73c1	User must be logged into Clara.io site to download	2017-01-12 09:15:01 +13:00
David Rowe	71d6a5cb1d	Implement model request and download	2017-01-11 21:33:03 +13:00
David Rowe	530b176d09	Replace Clara download button with own	2017-01-11 16:36:18 +13:00
howard-stearns	9709bedca7	checkpoint	2017-01-04 16:55:58 -08:00
David Rowe	3d6fe6efe8	Move Clara download button when displaying on tablet	2016-12-16 14:58:22 +13:00
David Rowe	04aef641c5	Fix auto-downloads not happening after forced log in	2016-12-16 11:45:17 +13:00
David Rowe	a7e0135a6a	Continuously update Clara pages because content can change dynamically	2016-12-16 11:28:34 +13:00
David Rowe	861ce2c27b	Reduce whitespace in Clara categories	2016-12-15 20:33:43 +13:00
David Rowe	eb7b2dbdcf	Improve robustness of navigation footer	2016-12-14 15:07:06 +13:00
David Rowe	2b0529bcea	Inform user if can't do Clara.io download because can't write to ATP	2016-12-14 14:45:33 +13:00
David Rowe	4890e92733	Start at HiFi marketplace page instead of directory page	2016-12-14 00:12:52 +13:00
David Rowe	8195393205	Fix Clara marketplace button appearing on top of navigation footer	2016-12-13 22:54:19 +13:00
David Rowe	20623ebddb	Raise and lower keyboard on password fields	2016-12-13 22:48:17 +13:00
David Rowe	14ecb24986	Remove extra browse history item created by Clara download	2016-12-11 17:43:55 +13:00
David Rowe	c87149cfc2	Tidying	2016-12-10 12:59:01 +13:00
David Rowe	c4c2a95e83	Add "back" button to marketplaces footer	2016-12-08 10:58:37 +13:00
David Rowe	1de2c14fee	Remove e-mail message hyperlink if displaying on tablet	2016-12-07 12:52:53 +13:00
David Rowe	e821ec5593	Inject navigation footer into Clara account createion page	2016-12-07 12:38:16 +13:00
David Rowe	01226b03ef	Improve text and robustness of marketplaces footer	2016-12-07 12:20:43 +13:00
David Rowe	8e30674069	Tidying	2016-12-07 09:28:35 +13:00
David Rowe	d857f943f8	Handle Clara marketplace downloads	2016-12-07 09:16:59 +13:00
David Rowe	b83d5c6275	Inject Clara Web page modifications	2016-12-05 21:34:34 +13:00
David Rowe	f04c493e16	Fix navigation bar and opaqueness of Web page	2016-12-05 17:48:20 +13:00
David Rowe	a75d0b3fe8	Merge branch 'master' into 21089	2016-11-30 14:50:51 +13:00
Zach Fox	20a2d1275a	Bugfixes and GIF uploads workinggit add -A!	2016-11-18 14:39:30 -08:00