83816 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Kalila L	a90af38921	Fix badly formatted JSON metadata being sent to metaverse.	2020-09-25 20:55:43 -04:00
Kalila L	9e8dc88f63	Fix temporary place name assignment.	2020-09-24 18:06:39 -04:00
Kalila L	a965ac8591	Fix some weird context.	2020-09-24 17:30:15 -04:00
Kalila L	2c1a51e7c4	Remove inventory app from defaultScripts.js	2020-09-24 16:03:27 -04:00
kasenvr	d46c6c192e	Merge pull request #753 from daleglass/improve-url-migrations ... Sanitize URLs in ExternalResources	2020-09-24 15:40:30 -04:00
Dale Glass	9b4d115a5d	Review fixes ... Make it ignore a // at the beginning of the URL	2020-09-24 19:37:14 +02:00
Kalila L	a50918b723	Merge branch 'master' into fix/URL-migrations	2020-09-23 18:56:50 -04:00
Dale Glass	1d58ac4d79	Sanitize the URL further by removing leading slashes and any duplicated ones	2020-09-23 23:33:22 +02:00
Dale Glass	b243d382fc	Fix warning due to multiline comment	2020-09-23 22:34:01 +02:00
kasenvr	892f97d38d	Merge pull request #751 from ctrlaltdavid/fix/external-resource ... Fix/external resource	2020-09-23 15:40:33 -04:00
David Rowe	32b7823a73	Merge remote-tracking branch 'upstream/fix/URL-migrations' into fix/external-resource ... # Conflicts: # libraries/networking/src/ExternalResource.h	2020-09-23 23:25:42 +12:00
David Rowe	1cb1c63228	Tidying	2020-09-23 23:08:02 +12:00
David Rowe	32efb2443e	Don't store current CDN paths in Interface.json at present	2020-09-23 22:15:40 +12:00
David Rowe	c6ba42b7d6	Fix calculating external resource paths	2020-09-23 22:15:13 +12:00
kasenvr	d6932aa540	Merge pull request #632 from Misterblue/fix/add-get-temp-name ... Add --get-temp-name to domain-server invocation in creation of Docker	2020-09-23 04:13:05 -04:00
Kalila L	24d4076079	Fix another URL.	2020-09-23 03:56:50 -04:00
Kalila L	560a1a7119	Update sandbox URL.	2020-09-23 03:29:03 -04:00
Kalila L	ec15b51110	Fix typo.	2020-09-23 02:52:20 -04:00
kasenvr	567c3475c5	Merge pull request #654 from Madders/feature/update-explore-ui ... Updated the Explore app UI	2020-09-23 02:04:20 -04:00
Kalila L	ed5a7e82d7	Fix default URLs for edit.js	2020-09-23 01:57:00 -04:00
David Rowe	ba7242f4dc	Script.getExternalPath() and related JSDoc	2020-09-23 17:23:40 +12:00
Kalila L	b493f0c51d	Alter icon positions, colors, combine visit and search box. Add tooltips for some buttons.	2020-09-23 01:22:04 -04:00
Kalila L	2d871a8f88	Add hover effect for cards and fix description for add location.	2020-09-23 00:54:50 -04:00
Kalila L	1c9e1dd160	Remove redundant buckets.	2020-09-23 00:14:31 -04:00
Kalila L	3866bf478b	Fix icon resolutions.	2020-09-23 00:04:27 -04:00
Kalila L	0cb6261d11	Catch stragglers.	2020-09-22 20:25:19 -04:00
Kalila L	ff46a40741	Update avatarbookmarks.json and allow parsing of new 'avatarIcon' property.	2020-09-22 20:16:15 -04:00
Kalila L	154a95ac86	Update all scripts, script-archive scripts still broken.	2020-09-22 19:24:58 -04:00
kasenvr	79d34f6f1c	Merge pull request #748 from ctrlaltdavid/fix/screenshare-crash ... Fix Interface start-up crash on Windows	2020-09-22 15:43:20 -04:00
David Rowe	4959ca4975	Move ExternalResource call into method ... Fixes Interface crash on Windows.	2020-09-22 20:52:52 +12:00
David Rowe	3344c7423d	Fix up types	2020-09-22 20:52:15 +12:00
Kalila L	085bdf0016	Merge branch 'master' into pr/654	2020-09-22 01:55:24 -04:00
kasenvr	4602ec7cad	Merge pull request #738 from kasenvr/fix/chat-app ... Fix chat opening due to other users triggering	2020-09-22 00:24:13 -04:00
kasenvr	894ffda5c2	Merge pull request #743 from ctrlaltdavid/fix/glb-asset-server ... Fix GLB files not being able to be added from Asset Server	2020-09-22 00:23:45 -04:00
kasenvr	457cc56f1a	Update FloofChat.html ... Fix formatting issues.	2020-09-21 23:48:36 -04:00
Kalila L	5a321cdaa8	Fix links.	2020-09-21 16:23:30 -04:00
Kalila L	9db333a555	Update CDN URLs in NetworkingConstants.h	2020-09-21 16:07:56 -04:00
Kalila L	7b7038fae1	Bunch of URL updates later...	2020-09-21 00:54:49 -04:00
Kalila L	d3a97832a3	Update the rest of non /script-archive/ script URLs.	2020-09-21 00:14:22 -04:00
Kalila L	aeae078b67	Update some archived scripts.	2020-09-20 23:37:55 -04:00
Kalila L	a95c457499	Update active scripts.	2020-09-20 23:37:44 -04:00
Kalila L	0d08254a07	Some updates to URLs in C++	2020-09-20 23:37:29 -04:00
Kalila L	d423b51e5f	Change content.vircadia.com -> cdn-1.vircadia.com	2020-09-20 22:55:40 -04:00
David Rowe	8227705ed7	Fix GLB files not being able to be added from Asset Server	2020-09-21 11:59:02 +12:00
Kalila L	b1f32dd9ac	Merge branch 'pr/691' into fix/URL-migrations	2020-09-20 17:58:26 -04:00
Kalila L	f465ecb53b	Update STUN server	2020-09-20 17:56:54 -04:00
Kalila L	ecf3e67bdf	Improve URL formatting and refactor.	2020-09-20 00:44:40 -04:00
Kalila L	2a5604a166	Fix chat window toggling for all users on domain.	2020-09-20 00:44:04 -04:00
Dale Glass	929f395503	Spend more less time in the lock, do a sanity check, normalize path	2020-09-20 02:09:54 +02:00
Dale Glass	25a9716642	Fix crash due to incorrect assert	2020-09-20 02:08:22 +02:00