Commit Graph

2010 Commits

Author SHA1 Message Date
David Négrier
de7bf08de1
Merge pull request #632 from thecodingmachine/feat/url-room-started
Removed hard coded default map (2)
2021-01-21 10:10:22 +01:00
David Négrier
bbf9325396 Simplifying code and making START_ROOM_URL compatible with public (_) and private (@) paths 2021-01-21 09:40:11 +01:00
David Négrier
c568f32ff1
Merge pull request #631 from thecodingmachine/fixdockerstartup
Fixing docker-compose startup
2021-01-21 09:08:53 +01:00
David Négrier
ae48284460 Fixing docker-compose startup
With the addition of ./template.sh in #623, we now need to call the templater on each container startup, even in development environments.
2021-01-21 09:02:47 +01:00
Thomas Basler
d79a18ee81 Removed unused URL_ROOM_STARTED variable from pusher and back 2021-01-20 22:56:24 +01:00
Thomas Basler
14b328c733 Removed hard coded default map
You can apply local maps using the maps vhost as previously.
But it's also possible to specify external maps by prepending http or https.
2021-01-20 22:56:21 +01:00
David Négrier
84f85effe5
Merge pull request #628 from thecodingmachine/template-analytics
Template google analytics data (2)
2021-01-20 18:03:28 +01:00
David Négrier
f87f3889df Running templater in CI phase 2021-01-20 18:00:11 +01:00
David Négrier
9e469a4a8f Removing Google Analytics tracking from test environments 2021-01-20 17:30:26 +01:00
David Négrier
15b3e87bd1 Renaming TRACKING_NUMBER to GA_TRACKING_ID 2021-01-20 17:30:11 +01:00
David Négrier
fd89d54ed9 Adding GA tracking in test envs 2021-01-20 16:57:30 +01:00
David Négrier
aa9a21ad4c
Merge pull request #581 from Informatic/fix/firefox-webcam
front: fix webrtc webcam feed on Firefox
2021-01-20 16:27:45 +01:00
David Négrier
b03abee481 Fixing admin links 2021-01-20 10:34:34 +01:00
David Négrier
2452c96bf1
Merge pull request #620 from thecodingmachine/develop
Deploy 2021-01-18
2021-01-19 21:49:45 +01:00
grégoire parant
cb7cf7a141
Merge pull request #625 from thecodingmachine/phaser3.54
FEATURE: updated phaser to version 3.52
2021-01-19 18:51:03 +01:00
kharhamel
49531bb8fa FEATURE: updated phaser to version 3.52 2021-01-19 18:31:58 +01:00
Jean-Philippe Evrard
e2f400472f Template google analytics data
Without this patch, the index.html contains google analytics at
all times, including for people self-hosting it.

This is a problem for privacy reasons, and only people wanting
to have analytics on their instances should be able to enable
them.

This fixes it by making sure the index.html page is templated
to sideload content from ANALYTICS_CODE_PATH (which itself is
also templated, for convenience).
2021-01-19 12:17:05 +01:00
Gregoire Parant
c95419f0e7 Prepar release 1.1.0
Automatically redirect on floor0 of TCM map
2021-01-18 22:52:25 +01:00
David Négrier
d891a288b5 Switching to new admin url 2021-01-18 21:02:25 +01:00
David Négrier
1f9d975505 Fixing CI 2021-01-18 19:52:44 +01:00
David Négrier
db1e700488
Merge pull request #618 from thecodingmachine/featureBan
Removing website container entirely from project
2021-01-18 19:49:21 +01:00
David Négrier
675c043cb5 Removing website container entirely from project (as it is specific to the WorkAdventure company and not to the WorkAdventure self-installed project) 2021-01-18 19:39:22 +01:00
David Négrier
c466ba8ca5
Merge pull request #601 from thecodingmachine/featureBan
Create ban feature by admin console
2021-01-18 19:31:51 +01:00
David Négrier
4df200c6c0 Switching ban by IP to be world specific 2021-01-18 16:41:36 +01:00
Gregoire Parant
5954ded195 Update link for private TCM map 2021-01-18 16:25:44 +01:00
David Négrier
0d4808231a Linting code 2021-01-18 15:43:27 +01:00
David Négrier
65d2c3dfb0 Disabling explicit any check on error handling 2021-01-18 15:36:02 +01:00
David Négrier
e0fcb38c4f Fixing CI pipeline 2021-01-18 15:34:22 +01:00
David Négrier
8fcc1534d8 Fixing let/const in Admin 2021-01-18 15:31:19 +01:00
David Négrier
217b04dafa Adding pusher CI 2021-01-18 15:31:07 +01:00
David Négrier
d1222e4440 Refactoring admin messages 2021-01-18 15:07:40 +01:00
grégoire parant
ddb7e2a12b
Merge pull request #614 from thecodingmachine/fixFocusCamScene
Fix focus cam on select cam scene
2021-01-18 10:52:28 +01:00
Gregoire Parant
679dbd4215 Fix focus cam on select cam scene 2021-01-18 10:40:13 +01:00
David Négrier
b1d4af005e Adding missing use statement 2021-01-17 22:44:22 +01:00
David Négrier
4234b38910 Better error message in case of 404 2021-01-17 22:40:54 +01:00
David Négrier
48c3f951bf Correctly forwarding HTTP error status code from admin to front 2021-01-17 20:42:45 +01:00
David Négrier
a5aa9b6cf9 /map now returns the correct error status code 2021-01-17 20:42:45 +01:00
David Négrier
adca51f6de Replacing FourOFourScene with more generic ErrorScene 2021-01-17 20:42:45 +01:00
Gregoire Parant
0bbaef0cb5 Fix send message and ban message 2021-01-17 03:07:46 +01:00
Gregoire Parant
74d0594246 Fix feedback @moufmou 2021-01-16 20:14:21 +01:00
Gregoire Parant
a7398fa851 Fix ci 2021-01-15 05:12:23 +01:00
Gregoire Parant
b1f8522c05 Create ban feature by admin console 2021-01-15 03:19:58 +01:00
Gregoire Parant
8c9e9522db Revert "Update ban feature"
This reverts commit d2ee52ce43.
2021-01-15 03:15:14 +01:00
Gregoire Parant
d2ee52ce43 Update ban feature 2021-01-15 03:14:15 +01:00
David Négrier
92246df8b6
Merge pull request #598 from thecodingmachine/develop
master
2021-01-14 18:01:18 +01:00
Kharhamel
871ee6b192
Merge pull request #596 from thecodingmachine/fixLazyLoadCrash
fixed a crash linked to incorrect textureDescriptors
2021-01-14 15:14:25 +01:00
kharhamel
fd29826556 fixed a crash linked to incorrect textureDescriptors 2021-01-14 14:47:02 +01:00
psy
8d67947bc1 move map url to else case 2021-01-14 11:48:06 +01:00
psy
f431e769cc add remote files and streams to playAudio 2021-01-14 11:45:14 +01:00
David Négrier
16205bc4c8
Merge pull request #593 from thecodingmachine/develop
Deploy 2020-01-13
2021-01-13 19:06:28 +01:00