2fcb8a76b1
Merge branch 'master' into develop
...
# Conflicts:
# front/src/Connexion/RoomConnection.ts
# front/src/Phaser/Menu/ReportMenu.ts
2021-03-11 02:22:05 +01:00
ce6976ec34
Merge pull request #806 from thecodingmachine/hot-fix-moderate-controls
...
Hot fix moderate controls
2021-03-11 02:13:15 +01:00
2cf99df2da
Hot Fix report
2021-03-11 02:03:06 +01:00
46cb9333e6
HotFix message in back
2021-03-11 01:25:36 +01:00
d95c71281f
Bump elliptic from 6.5.3 to 6.5.4 in /front
...
Bumps [elliptic](https://github.com/indutny/elliptic ) from 6.5.3 to 6.5.4.
- [Release notes](https://github.com/indutny/elliptic/releases )
- [Commits](https://github.com/indutny/elliptic/compare/v6.5.3...v6.5.4 )
Signed-off-by: dependabot[bot] <support@github.com>
2021-03-10 13:26:46 +00:00
a28fcbb9e6
Catching error when JWT token cannot be generated to avoid crashing Pusher
2021-03-10 09:41:54 +01:00
21cc842c33
Merge pull request #793 from thecodingmachine/adminWorldsLimit
...
FEATURE: the connexion error an user can get when a world is full is now correctly treated.
2021-03-09 17:45:43 +01:00
8abc34c631
FEATURE: the connexion error an user can get when a world is full is now correctly traited. Also remove a redundant adminApi call
2021-03-09 16:34:19 +01:00
f3c67a94ee
Trying to enable back connection on admin from develop, knowing that the develop certificate is broken. Fixing priority.
2021-03-09 09:12:55 +01:00
1a4c7ad928
Trying to enable back connection on admin from develop, knowing that the develop certificate is broken
2021-03-08 10:58:57 +01:00
80df1ffb5f
Revert "Adding back admin in develop branch CI"
...
This reverts commit c384a73edf
2021-03-05 17:45:16 +01:00
c384a73edf
Adding back admin in develop branch CI
2021-03-05 16:52:54 +01:00
99ab99d893
Merge pull request #792 from thecodingmachine/gafix
...
Fixing GA tag not included in play domain
2021-03-05 10:52:16 +01:00
15405633d1
Fixing GA tag not included in play domain
...
The GA tag was not properly included because the index.html file that contained it was overwritten by Webpack's HtmlWebpackPlugin.
2021-03-05 10:00:11 +01:00
bf8e8bf777
Merge pull request #689 from znerol-forks/feature/cowebsite-load-map-relative-url
...
Allow URLs relative to map base in iframe / openWebsite
2021-03-04 18:21:48 +01:00
5833629469
Merge pull request #784 from thecodingmachine/betterGlobalMessage
...
FEATURE: better implementation of the admin global message
2021-03-04 18:10:52 +01:00
ad7e16c33b
FEATURE: better implementation of the admin global message
2021-03-04 16:18:06 +01:00
df610aa01b
Merge pull request #785 from thecodingmachine/updatePrivateAccess
...
Update private access
2021-03-02 14:35:39 +01:00
915d945dd5
Fix ci
2021-03-01 22:32:50 +01:00
30f4793342
Update private access
2021-03-01 22:21:52 +01:00
e0540790e1
Translating button
2021-03-01 14:36:18 +01:00
95da470a89
Improve visibility of close button for embedded web pages
...
The button (a white x) wasn't visible on white background. Now it is. Also is a little bit larger and changes color on hover.
2021-03-01 14:08:56 +01:00
48c13119bd
Merge pull request #776 from s00500/fix_report_menu
...
Fix report userId in report menu
2021-02-27 23:16:23 +01:00
2772d72eba
Fix report userId in report menu
...
Signed-off-by: Lukas Bachschwell <lukas@lbsfilm.at>
2021-02-24 21:32:16 +01:00
6e6b607226
Use email address from .env
2021-02-19 23:10:48 +01:00
6e9c715980
Merge pull request #739 from t10r/fix/multi-user-videochat-mode
...
fix multi user videochat mode
2021-02-19 14:54:38 +01:00
3eec41a1d0
Merge pull request #762 from thecodingmachine/develop
...
Deploy 2021-02-18
2021-02-18 20:10:55 +01:00
6f06b92395
Merge pull request #760 from thecodingmachine/turncredentials
...
Fixing screensharing Coturn credentials
2021-02-18 14:09:33 +01:00
13a20a0ef0
Fixing screensharing Coturn credentials
...
When screensharing is initiated by the user, we previously did not send the correct Coturn credentials.
We now send the last credentials received from the Video stream.
2021-02-18 11:52:30 +01:00
b5514e6e48
Merge pull request #759 from thecodingmachine/jitsiConfig
...
Fix last properties changed after trigger change position
2021-02-18 11:37:41 +01:00
772c3174be
Fix last properties changed after trigger change position
2021-02-18 11:32:37 +01:00
3a1b2490ef
Merge pull request #758 from thecodingmachine/jitsiConfig
...
Jitsi config
2021-02-18 10:12:16 +01:00
80449e9a96
Change json map test
2021-02-18 10:00:13 +01:00
8a2954eab9
Fix new conf feature
2021-02-18 09:38:27 +01:00
13078489c6
Merge pull request #757 from thecodingmachine/jitsiConfig
...
Merge Jitsi config
2021-02-17 20:34:31 +01:00
5ddf909fe6
Remove unless export constante
2021-02-17 20:26:33 +01:00
c3286e61cf
Merge pull request #655 from thecodingmachine/exitTriggerAction
...
Message trigger action
2021-02-17 19:47:46 +01:00
fff0cbc3f6
Revert message exit
2021-02-17 19:40:00 +01:00
9b7b3eb140
Update feedback @tabascoeye
2021-02-17 19:31:05 +01:00
ce423c9fec
Remove exit trigger action
2021-02-17 19:29:59 +01:00
83fc7d0cc0
Merge branch 'develop' into exitTriggerAction
...
# Conflicts:
# front/src/Phaser/Game/GameScene.ts
2021-02-17 19:28:41 +01:00
baae1e8125
Update to restore previous config
2021-02-17 19:21:37 +01:00
e8b1b286a3
Merge Jitsi config
2021-02-17 18:49:55 +01:00
36a713ec91
Merge pull request #754 from thecodingmachine/develop
...
Deploy 2021-02-16
2021-02-16 20:28:39 +01:00
ae1d00c828
Merge pull request #736 from MisterErwin/patch-1
...
Fix offsets of SpeechBubble.ts
2021-02-16 20:02:03 +01:00
43b48ce555
Merge pull request #737 from MisterErwin/patch-2
...
Do not change rooms if scene failed to load
2021-02-16 20:01:00 +01:00
ddcb5ede59
Merge pull request #742 from znerol-forks/fix/huge-jitsi-url
...
Fix jitsi URLs growing indefinitely in length
2021-02-16 19:52:56 +01:00
9affa36608
Merge pull request #746 from thecodingmachine/turncredentials
...
[Feature] Connect to a Coturn server using REST API
2021-02-16 19:32:21 +01:00
f00d07289c
Merge pull request #753 from thecodingmachine/fixJitsiConfig
...
FIX: current audio and video status are overwriten by jitsi config
2021-02-16 19:02:52 +01:00
e21868ed3b
FIX: current audio and video status are overwriten by jitsi config
2021-02-16 18:25:23 +01:00
Gregoire Parant