76 commits

Author	SHA1	Message	Date
elisa-lj11	bebf9c5890	Added error feature when user tries to download a non fbx file	2016-08-31 17:46:35 -07:00
elisa-lj11	aceddb0cf8	merge with james repo	2016-08-30 15:07:01 -07:00
elisa-lj11	fa941e4a1b	Merge remote-tracking branch 'origin' into marketplaces_html	2016-08-30 10:42:56 -07:00
elisa-lj11	f2e61aa504	added status bar to marketplace	2016-08-29 18:43:32 -07:00
James B. Pollack	2b2b2ecbac	caps	2016-08-29 17:44:33 -07:00
James B. Pollack	d3aad53e0e	cleanup	2016-08-29 17:43:32 -07:00
James B. Pollack	2a12f2feae	marketplaces html	2016-08-29 17:27:39 -07:00
James B. Pollack	95c627aa71	dev	2016-08-29 14:24:36 -07:00
James B. Pollack	264176dac6	css	2016-08-26 14:21:32 -07:00
James B. Pollack	382cbd0a73	start	2016-08-26 14:16:37 -07:00
James B. Pollack	ee190db5eb	some comments	2016-08-25 16:27:58 -07:00
James B. Pollack	9be073cc12	handle some more cases	2016-08-25 16:03:12 -07:00
Anthony J. Thibault	c2af948e25	Merge branch 'master' into feature/handheld-marketplace	2016-08-24 16:07:04 -07:00
Ryan Huffman	4897d721c3	Merge pull request #8505 from imgntn/json_editor ... New Editor for UserData JSON	2016-08-24 15:49:32 -07:00
James B. Pollack	af2fb5d7ed	beautify more html	2016-08-24 14:54:00 -07:00
James B. Pollack	5305ec7feb	html beautify	2016-08-24 14:51:15 -07:00
James B. Pollack	384c3dd543	cleanup and handle a bug when changing from normal text userdata to another field	2016-08-24 14:49:41 -07:00
James B. Pollack	2f4617cd5e	quiet some prints	2016-08-23 18:20:33 -07:00
James B. Pollack	a5054487ba	save on no selections, select another entity, etc	2016-08-23 18:18:43 -07:00
James B. Pollack	3abbc98857	save when focus on inputs	2016-08-23 15:48:04 -07:00
James B. Pollack	477ed88284	remove autosave, disable save button until change	2016-08-23 14:34:28 -07:00
James B. Pollack	5166a33370	autosave after 1.5 s no changes	2016-08-23 11:53:20 -07:00
Anthony J. Thibault	d607abc8f7	Add dpi to edit.js ... Also, cap the maximum webEntity texture size to 4096	2016-08-23 10:10:27 -07:00
James B. Pollack	6ec429fa0b	remove unused event listeners	2016-08-23 00:19:03 -07:00
James B. Pollack	d9a39553bd	style edits and saved message	2016-08-23 00:14:53 -07:00
James B. Pollack	d0a25e7783	fix switching entities	2016-08-22 23:51:35 -07:00
James B. Pollack	e2a6c08f19	cleanup prints	2016-08-22 17:44:22 -07:00
James B. Pollack	4b61cc9f5f	new user data editor	2016-08-22 17:30:08 -07:00
howard-stearns	bc90b0bc43	pr review	2016-08-22 16:09:09 -07:00
howard-stearns	fc906df5f6	separate into three files	2016-08-22 15:04:38 -07:00
howard-stearns	989974738a	dead code removal	2016-08-22 12:50:51 -07:00
David Rowe	80ee864143	Add icon to "Share in Feed" button	2016-08-20 18:17:49 +12:00
David Rowe	8d88726dba	Fix spacing above image when single column	2016-08-20 13:57:00 +12:00
David Rowe	a94c24e6df	Text and controls	2016-08-20 13:44:47 +12:00
David Rowe	6a9f221a9e	Snapshot image border	2016-08-20 11:36:53 +12:00
David Rowe	3d2afaac77	Size and position snapshot dialog content blocks	2016-08-20 11:19:30 +12:00
howard-stearns	a3d64dbd9c	code cleanup	2016-08-19 14:14:31 -07:00
howard-stearns	5e8722ccf5	persist "open feed after" checkbox setting	2016-08-18 12:58:00 -07:00
howard-stearns	8823f48666	new snapshot review behavior	2016-08-17 10:00:20 -07:00
howard-stearns	afe376a0a2	fix breakage I made to snapshot uploading	2016-08-12 14:08:50 -07:00
howard-stearns	1b62332058	don't show checkboxes on confirmation dialog when there's only one picture	2016-08-12 11:50:11 -07:00
howard-stearns	ae9af88db2	Spacing and better size for HMD pictures.	2016-08-12 11:28:35 -07:00
David Kelly	3408ad6f54	Wording change	2016-08-12 10:23:33 -07:00
David Kelly	e23e9014c6	Merge remote-tracking branch 'upstream/discovery' into dk/gateSnapshotShares	2016-08-12 10:16:27 -07:00
howard-stearns	e3aae0e93f	Fix up layout, and adapt to recent changes in file structure	2016-08-11 16:23:01 -07:00
howard-stearns	e6746acf4c	Merge branch 'master' of https://github.com/highfidelity/hifi into discovery	2016-08-11 15:40:26 -07:00
David Kelly	c1edd008a4	PR feedback	2016-08-11 11:47:55 -07:00
David Kelly	47dea0ea2b	Hide sharing if not logged in, or in an accessible place ... The grand future will have option to login, and so on...	2016-08-10 17:09:43 -07:00
howard-stearns	5715fd00f3	proper share dialog	2016-08-09 16:42:41 -07:00
Zach Pomerantz	d5b822ddbe	remove missing camera selectors	2016-08-09 15:23:36 -07:00