_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
1,528 Commits 2 Branches 0 Tags 47 MiB
ad4f8e892e
Commit Graph

1528 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
githubIsNotOpenSourceLOL
ec691a75fe
Update .env.template 2021-03-18 13:26:02 +01:00
kharhamel
0701e607fa added sass loader to the project and put the cowebsite style in its own sass file 2021-03-18 12:37:05 +01:00
kharhamel
f9c8b4131c added fullscreen 2021-03-17 18:57:00 +01:00
kharhamel
272be3eba0 improve the visual of the cowebsite 2021-03-17 18:35:19 +01:00
kharhamel
3f6c61633a FEATURE: complete control over the iframe size 2021-03-17 18:34:12 +01:00
Kharhamel
19856c0ee9
Merge pull request #783 from Moini/patch-1 
Improve visibility of close button for embedded web pages
 2021-03-17 14:35:11 +01:00
David Négrier
4a50729db3
Merge pull request #817 from thecodingmachine/customjitsiurl 
Adding the ability to specify a custom Jitsi URL directly in the map
 2021-03-16 21:33:35 +01:00
David Négrier
ffb5823b2a Adding the ability to specify a custom Jitsi URL directly in the map 
This feature allows to add a "jitsiUrl" property in the map.
As a result, you can use for a given Jitsi room a custom instance of Jitsi.
Using "jitsiUrl" will only work with public Jitsi instances (authentication is not supported when "jitsiUrl" property is provided)

The Jitsi external_api.js script is now lazily loaded.
 2021-03-16 20:37:12 +01:00
Wikinaut
d8c74fa838
update /etc/hosts readme 2021-03-15 15:37:51 +01:00
Kharhamel
18fa1e6153
Merge pull request #807 from thecodingmachine/improvePlayerAnims 
FIX: player anims correctly stop on the idle frame
 2021-03-11 16:34:20 +01:00
kharhamel
fe8c75610d FIX: player anims correctly stop on the idle frame 2021-03-11 16:21:02 +01:00
Gregoire Parant
59c310d0a8 Update to optimize maintainability of the code 2021-03-11 12:17:37 +01:00
Gregoire Parant
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
grégoire parant
ce6976ec34
Merge pull request #806 from thecodingmachine/hot-fix-moderate-controls 
Hot fix moderate controls
 2021-03-11 02:13:15 +01:00
Gregoire Parant
2cf99df2da Hot Fix report 2021-03-11 02:03:06 +01:00
Gregoire Parant
46cb9333e6 HotFix message in back 2021-03-11 01:25:36 +01:00
dependabot[bot]
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
David Négrier
a28fcbb9e6 Catching error when JWT token cannot be generated to avoid crashing Pusher 2021-03-10 09:41:54 +01:00
Kharhamel
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
kharhamel
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
David Négrier
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
David Négrier
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
David Négrier
80df1ffb5f Revert "Adding back admin in develop branch CI" 
This reverts commit c384a73edf.
 2021-03-05 17:45:16 +01:00
David Négrier
c384a73edf Adding back admin in develop branch CI 2021-03-05 16:52:54 +01:00
David Négrier
99ab99d893
Merge pull request #792 from thecodingmachine/gafix 
Fixing GA tag not included in play domain
 2021-03-05 10:52:16 +01:00
David Négrier
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
David Négrier
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
Kharhamel
5833629469
Merge pull request #784 from thecodingmachine/betterGlobalMessage 
FEATURE: better implementation of the admin global message
 2021-03-04 18:10:52 +01:00
kharhamel
ad7e16c33b FEATURE: better implementation of the admin global message 2021-03-04 16:18:06 +01:00
grégoire parant
df610aa01b
Merge pull request #785 from thecodingmachine/updatePrivateAccess 
Update private access
 2021-03-02 14:35:39 +01:00
Gregoire Parant
915d945dd5 Fix ci 2021-03-01 22:32:50 +01:00
Gregoire Parant
30f4793342 Update private access 2021-03-01 22:21:52 +01:00
David Négrier
e0540790e1 Translating button 2021-03-01 14:36:18 +01:00
Moini
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
David Négrier
48c13119bd
Merge pull request #776 from s00500/fix_report_menu 
Fix report userId in report menu
 2021-02-27 23:16:23 +01:00
Lukas Bachschwell
2772d72eba
Fix report userId in report menu 
Signed-off-by: Lukas Bachschwell <lukas@lbsfilm.at>
 2021-02-24 21:32:16 +01:00
githubIsNotOpenSourceLOL
6e6b607226
Use email address from .env 2021-02-19 23:10:48 +01:00
David Négrier
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
David Négrier
3eec41a1d0
Merge pull request #762 from thecodingmachine/develop 
Deploy 2021-02-18
 2021-02-18 20:10:55 +01:00
David Négrier
6f06b92395
Merge pull request #760 from thecodingmachine/turncredentials 
Fixing screensharing Coturn credentials
 2021-02-18 14:09:33 +01:00
David Négrier
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
grégoire parant
b5514e6e48
Merge pull request #759 from thecodingmachine/jitsiConfig 
Fix last properties changed after trigger change position
 2021-02-18 11:37:41 +01:00
Gregoire Parant
772c3174be Fix last properties changed after trigger change position 2021-02-18 11:32:37 +01:00
grégoire parant
3a1b2490ef
Merge pull request #758 from thecodingmachine/jitsiConfig 
Jitsi config
 2021-02-18 10:12:16 +01:00
Gregoire Parant
80449e9a96 Change json map test 2021-02-18 10:00:13 +01:00
Gregoire Parant
8a2954eab9 Fix new conf feature 2021-02-18 09:38:27 +01:00
grégoire parant
13078489c6
Merge pull request #757 from thecodingmachine/jitsiConfig 
Merge Jitsi config
 2021-02-17 20:34:31 +01:00
Gregoire Parant
5ddf909fe6 Remove unless export constante 2021-02-17 20:26:33 +01:00
grégoire parant
c3286e61cf
Merge pull request #655 from thecodingmachine/exitTriggerAction 
Message trigger action
 2021-02-17 19:47:46 +01:00
Gregoire Parant
fff0cbc3f6 Revert message exit 2021-02-17 19:40:00 +01:00