_Bastler
3b4cf0a68c
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-21 21:10:09 +02:00
GRL78
3f1c5246f8
TO MERGE : Contact page from Admin or Environment Variable ( #1401 )
...
* Contact page from Admin or Environment Variable
* Get contact page from admin by pusher
* Changes requested
* Modify contactPageStore management
* documentation environment variables
Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-21 20:24:53 +02:00
_Bastler
d305a91ffd
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-21 19:47:56 +02:00
Kharhamel
8b099e5725
FIX: added another catch case for default model
2021-09-21 14:29:15 +02:00
Gregoire Parant
3f954d273c
Merge branch 'master' into develop
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-21 02:37:56 +02:00
grégoire parant
e77d4dda84
Update favicon and logo to deploy new design ( #1475 )
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-20 22:42:15 +02:00
_Bastler
d3a24b06c2
change room slug
2021-09-20 19:31:51 +02:00
_Bastler
0164d24329
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-20 16:25:25 +02:00
Lurkars
781c69387c
fix wrong font name
2021-09-20 15:22:54 +02:00
_Bastler
49bd6f8a1c
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-20 15:17:30 +02:00
_Bastler
31579283cd
fix connection type
2021-09-20 15:06:44 +02:00
Kharhamel
9b13a6780c
Merge pull request #1437 from Lurkars/twemojiEmoteMenuSvelte
...
Twemoji emote menu svelte (upgrade of #1301 )
2021-09-20 14:33:16 +02:00
_Bastler
54346896b9
fix
2021-09-20 09:53:25 +02:00
_Bastler
1e43229956
fix?
2021-09-20 09:33:50 +02:00
_Bastler
afa12641aa
undo
2021-09-20 09:30:36 +02:00
_Bastler
9650453edc
quick fix
2021-09-20 09:27:18 +02:00
_Bastler
22c501e5e0
quick fix?
2021-09-20 09:24:47 +02:00
_Bastler
6af1651e03
remove instance, change room url, fix invalid lastRoomUrls
2021-09-20 08:56:14 +02:00
_Bastler
ccafaf11e3
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-20 08:55:41 +02:00
_Bastler
0c16f08f4e
fix quill build
2021-09-17 15:52:07 +02:00
_Bastler
29b9d29b7d
add quill css
2021-09-17 15:41:48 +02:00
_Bastler
ea64e79e46
fix localuser for OIDC
2021-09-17 14:02:43 +02:00
_Bastler
f053ece7da
remove old, fix nginx
2021-09-17 10:23:00 +02:00
_Bastler
0bf49fa26a
native OIDC support
2021-09-17 09:46:04 +02:00
_Bastler
3a9ffd7557
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-16 18:39:06 +02:00
_Bastler
b47201687a
better we.bslty & deveop integration
2021-09-16 18:24:03 +02:00
Lurkars
63c4eeb4c7
Merge branch 'twemojiEmoteMenuSvelte' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte
2021-09-16 18:20:42 +02:00
Lurkars
7922de10ff
Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte
2021-09-16 18:12:51 +02:00
grégoire parant
553902e52a
Add log for Oauth login connexion ( #1468 )
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-09-16 17:57:14 +02:00
Kharhamel
483191c521
Merge pull request #1458 from thecodingmachine/posthog
...
FEATURE: added posthog as new analytics tool
2021-09-16 15:24:27 +02:00
Kharhamel
2e111aa13a
FEATURE: added posthog as new analytics tool
2021-09-16 15:16:10 +02:00
_Bastler
f69fe463de
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-15 16:52:39 +02:00
David Négrier
801ec3bf4c
Turn off audio on exit
...
If an exit zone is overlapping an audio zone, when exiting, the audio is stopped.
We do this by actually triggering the fact that a user should "leave" all active zones when exiting.
2021-09-15 15:28:55 +02:00
_Bastler
63e756c1d1
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-15 13:08:33 +02:00
David Négrier
0c374aba48
Merge pull request #1456 from thecodingmachine/jitsi-silent
...
Fixing silent zone not respected when exiting Jitsi
2021-09-15 11:27:50 +02:00
David Négrier
d26325d8dc
Fixing silent zone not respected when exiting Jitsi
...
Now, when a silent zone is adjacent to a Jitsi, it is enforced, even after leaving the Jitsi zone
2021-09-15 11:16:23 +02:00
_Bastler
025722db63
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-14 18:38:00 +02:00
GRL78
680e538fd6
save button in settings close menu ( #1451 )
2021-09-14 16:43:00 +02:00
_Bastler
67d0802d1b
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-14 14:41:41 +02:00
David Négrier
9006283c90
Merge pull request #1452 from Lurkars/audioPlayerImprovements
...
some fixes on the audio player controls
2021-09-14 14:41:40 +02:00
_Bastler
b256431828
action message html
2021-09-14 13:08:25 +02:00
_Bastler
0067a8edc2
fix external resources for twemoji
2021-09-14 11:44:45 +02:00
Lurkars
f1bd92fa52
use included twemoji mozilla font instead of loading external
2021-09-14 11:39:36 +02:00
GRL
ff3e844b68
chat scroll to bottom when it open
2021-09-14 09:36:49 +02:00
_Bastler
148540dafe
emojimenu, audiomanager
2021-09-14 08:56:37 +02:00
Lurkars
34d81b0e6c
fix behaviour
2021-09-14 08:55:15 +02:00
Lurkars
91bc524e06
disable controls
2021-09-14 08:50:43 +02:00
_Bastler
cf69b3259a
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-09-14 08:17:37 +02:00
Lurkars
beed50874b
fix emotemenu on open jitsi rooms
2021-09-13 19:16:47 +02:00
David Négrier
f92b728a8e
Fixing broken chat API
2021-09-13 14:50:02 +02:00
