202 commits

Author	SHA1	Message	Date
howard-stearns	699d1647ca	typo, and more conservative item limit	2018-07-26 12:01:56 -07:00
howard-stearns	f87db26cad	pal refresh that remembers your place	2018-07-23 15:25:06 -07:00
howard-stearns	a904182cc2	cr feedback	2018-07-18 14:03:26 -07:00
howard-stearns	cb5ac6f42c	Merge branch 'master' of https://github.com/highfidelity/hifi into app-refactor4-merge	2018-07-16 17:43:53 -07:00
howard-stearns	2c92b02b95	lint	2018-07-16 16:28:44 -07:00
howard-stearns	f1fed37763	cleanup	2018-07-16 15:58:01 -07:00
howard-stearns	ffa5259319	cleanup references to button, tablet	2018-07-16 13:06:12 -07:00
howard-stearns	46061a2a15	initial with pal	2018-07-16 11:54:05 -07:00
Zach Fox	c3ffe7eb97	Fix bubble shading; fix audio loudness calculation	2018-07-13 13:55:32 -07:00
Zach Fox	4daa0c6537	CR feedback	2018-07-13 12:47:45 -07:00
Zach Fox	fa518b995a	Fix my audio level	2018-07-12 15:16:54 -07:00
Zach Fox	92756d81ad	Implement MS16562: Massive PAL speedup!	2018-07-12 15:05:31 -07:00
Zach Fox	2fad55e5d0	Prevent PAL from re-enabling ContextOverlayInterface when it's not supposed to	2018-07-10 15:56:13 -07:00
Sam Gondelman	e8ec32c7f8	Merge pull request #13340 from SamGondelman/modelTextures ... Try to fix ModelOverlay texture loading	2018-06-11 16:09:10 -07:00
SamGondelman	2dae613612	remove conserveResources	2018-06-08 17:58:06 -07:00
howard-stearns	5257a254cb	more for the previous	2018-06-04 13:12:41 -07:00
howard-stearns	29b09d64e6	checkpoint with PAL working.	2018-06-01 13:33:45 -07:00
howard-stearns	bf26aec260	untabify	2018-05-10 16:39:56 -07:00
howard-stearns	50a53a5174	fix lastEdited vs pal	2018-05-10 16:00:01 -07:00
David Kelly	d84ea6bf0f	Don't populate user list in pal until you connect the events up	2018-04-20 16:09:20 -07:00
Zach Fox	095b4ba5f2	Reduce logging from some Commerce/Discovery features	2018-04-10 16:02:58 -07:00
Brad Hefta-Gaub	f5614618b9	Merge pull request #12288 from ctrlaltdavid/21729 ... Add location.domainID as a synonym for location.domainId	2018-01-31 13:50:48 -08:00
David Rowe	280264d7ed	Add location.domainID as a synonym for location.domainId ... And deprecate location.domainId.	2018-01-30 20:46:27 +13:00
Zach Fox	00555250a0	400 connections per page for Wallet and PAL	2018-01-29 12:07:07 -08:00
Zach Fox	1e608b13b2	Show username when admin (this probably isn't the way to get username	2018-01-11 14:45:43 -08:00
Brad Davis	bb2e061d77	Fixing global declarations in JS	2017-11-15 12:00:52 -08:00
Brad Davis	26a745be6f	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-15 11:59:06 -08:00
Brad Davis	1167be4102	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
luiscuenca	7dfdc8da59	Redesign and clean of unused lineWidths	2017-11-09 17:50:38 -07:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -07:00
Zach Fox	c64c2e17c8	First pass at consolidation	2017-10-24 12:01:05 -07:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
David Kelly	9c0026bf69	make sure context overlays are on after pal is dismissed	2017-07-21 08:40:12 -07:00
David Kelly	f365ce8abd	typo	2017-07-20 12:58:06 -07:00
David Kelly	b7be727b4c	turn off ContextOverlay for pal, edit. Improve clicks too	2017-07-20 11:30:55 -07:00
Zach Fox	e222753aac	Merge pull request #10911 from zfox23/PAL_adminFix2 ... Set admin status even if QML can't find user in PAL	2017-07-07 10:24:53 -07:00
Zach Fox	ea77557e38	Correctly close PAL when switching domains	2017-07-07 08:09:19 -07:00
Zach Fox	a5c7324ec5	Ensure admins see PAL admin column	2017-07-06 12:15:44 -07:00
Brad Davis	de88a34e97	Fix toolbar button activation states	2017-06-26 23:33:32 -07:00
Ryan Huffman	0e7ddfd29f	Disable silence/ban buttons in PAL if avatar is replicated	2017-06-21 09:49:16 -07:00
Zach Fox	cf3c10c5b1	Fix the bugs, add the feature	2017-05-09 14:40:41 -07:00
David Kelly	7d0494dd56	use new images in api/v1/users response json	2017-05-08 12:15:03 -07:00
CFresquet	28b166c51f	further request fiddling	2017-05-03 07:51:49 -07:00
CFresquet	b54ea63af7	incremental request module fixes	2017-05-03 07:35:30 -07:00
CFresquet	55fdf35c4a	merge of Request module	2017-05-01 13:02:18 -07:00
CFresquet	28aaa545d8	Created RequestModule	2017-05-01 08:07:16 -07:00
howard-stearns	f9debf1388	checkpoint	2017-04-28 16:53:08 -07:00
howard-stearns	3113dced7b	Be sure to callback even on profile failure.	2017-04-18 12:06:44 -07:00
David Kelly	a92162dea9	no mo useless debug statements	2017-04-06 08:50:22 -07:00