_Bastler
|
bc33d88726
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
|
2022-03-07 19:06:17 +01:00 |
|
David Négrier
|
07a4df8ad4
|
Importing Window object back in Iframe API
|
2022-03-07 18:35:17 +01:00 |
|
Anton Bracke
|
4535a8ae96
|
Merge remote-tracking branch 'upstream/develop' into electron
|
2022-03-03 14:43:33 +01:00 |
|
_Bastler
|
e87052ecc6
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
|
2022-02-28 19:12:42 +01:00 |
|
_Bastler
|
6faa31427b
|
fix iframe
|
2022-02-28 14:52:44 +01:00 |
|
Lurkars
|
0a2bfc556f
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile
|
2022-02-28 10:35:15 +01:00 |
|
_Bastler
|
51719660d9
|
Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure
|
2022-02-27 14:39:42 +01:00 |
|
_Bastler
|
86dc0d4aa8
|
add DOMPurify
|
2022-02-27 14:37:26 +01:00 |
|
_Bastler
|
9e86e95135
|
merge latest dev
|
2022-02-27 14:19:39 +01:00 |
|
_Bastler
|
2622041740
|
orig. formatting
|
2022-02-27 13:59:05 +01:00 |
|
_Bastler
|
0e1dff6a11
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite
|
2022-02-26 11:11:51 +01:00 |
|
_Bastler
|
7e9196a8a0
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite
|
2022-02-25 14:16:19 +01:00 |
|
_Bastler
|
ac4f16ad03
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite
|
2022-02-23 17:07:14 +01:00 |
|
_Bastler
|
021a2511e0
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite
|
2022-02-23 16:59:15 +01:00 |
|
Hanusiak Piotr
|
9fe4782fbd
|
clear hashParams after moving player with moveTo param
|
2022-02-23 10:14:09 +01:00 |
|
Gregoire Parant
|
658781e02e
|
Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
# Conflicts:
# front/public/resources/logos/meet.svg
|
2022-02-22 23:40:48 +01:00 |
|
Anton Bracke
|
4e243151dd
|
add desktop api to front
|
2022-02-22 16:57:56 +01:00 |
|
Gregoire Parant
|
0943ec8991
|
Define color text by brightness
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-21 01:09:53 +01:00 |
|
Gregoire Parant
|
070ad6b993
|
Add jiti logo for Jitsi button meeting
|
2022-02-20 23:38:20 +01:00 |
|
Gregoire Parant
|
23f7d6f08f
|
Update CoWebsite Jitsi
- Change Jitsi meeting icon
- Add Jitsi meeting information
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-20 23:28:27 +01:00 |
|
_Bastler
|
667e3c0944
|
Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure
|
2022-02-20 13:28:29 +01:00 |
|
Lukas Hass
|
3ee9b26650
|
use optional chaining
|
2022-02-19 20:25:17 +01:00 |
|
Lukas Hass
|
e8d5335bc0
|
Merge branch 'develop' into vite
|
2022-02-19 20:08:50 +01:00 |
|
_Bastler
|
7701e44715
|
Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure
|
2022-02-19 10:15:56 +01:00 |
|
Lukas Hass
|
cc24fd48d5
|
update generic-type-guard and @geprog/vite-plugin-env-config
allows to get rid of node built-in polyfills
|
2022-02-19 00:13:25 +01:00 |
|
Gregoire Parant
|
e4f9f89a40
|
Fix pretty
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-18 21:57:11 +01:00 |
|
Gregoire Parant
|
26f5416b63
|
Fix svelt check
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-18 21:44:17 +01:00 |
|
Gregoire Parant
|
3a734cc2ae
|
Enable limitation freemium
- Fix warning message
- Fix post message API pusher
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-18 21:33:23 +01:00 |
|
_Bastler
|
136269170d
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
|
2022-02-18 09:56:05 +01:00 |
|
Lukas Hass
|
2755489ccf
|
Merge branch 'develop' into vite
|
2022-02-17 15:20:58 +01:00 |
|
Lukas Hass
|
c163107875
|
import browserified version of simple-peer
|
2022-02-17 15:02:48 +01:00 |
|
Hanusiak Piotr
|
ecd4b5907a
|
disable corner cutting
|
2022-02-17 12:44:57 +01:00 |
|
Alexis Faizeau
|
f186111d2f
|
Fix importing coWesbite from API to store
|
2022-02-17 09:51:32 +01:00 |
|
_Bastler
|
b1728b7b8c
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
|
2022-02-16 20:25:12 +01:00 |
|
Gregoire Parant
|
f0c7e4ea8a
|
Update css warning message & add message button
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
|
2022-02-16 20:15:16 +01:00 |
|
David Négrier
|
eae6c2c5e3
|
Merge pull request #1887 from thecodingmachine/master
Backporting cowebsites hot-fixes
|
2022-02-16 18:03:23 +01:00 |
|
David Négrier
|
a7264954ea
|
Merge pull request #1820 from thecodingmachine/feature-voice-chat-indicator
Feature voice chat indicator
|
2022-02-16 16:46:13 +01:00 |
|
Hanusiak Piotr
|
e590cee753
|
forcing close talkIcon indicator when leaving bubble conversation
|
2022-02-16 15:55:07 +01:00 |
|
Hanusiak Piotr
|
0b0d3b5beb
|
fixed issue with chat indicator persisting after being out of conversation
|
2022-02-16 14:56:59 +01:00 |
|
Hanusiak Piotr
|
dea5784c9b
|
Merge branch 'develop' into feature-voice-chat-indicator
|
2022-02-16 14:37:01 +01:00 |
|
Hanusiak Piotr
|
3c54e38401
|
unlock diagonal movement
|
2022-02-16 14:28:35 +01:00 |
|
Hanusiak Piotr
|
3875d3b0f5
|
Merge branch 'develop' into avoid-exits-on-path
|
2022-02-16 14:03:48 +01:00 |
|
_Bastler
|
dca2cc3c6c
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
|
2022-02-16 09:16:54 +01:00 |
|
Lurkars
|
2816946c94
|
add OIDC username + locale
|
2022-02-16 09:11:08 +01:00 |
|
Lukas Hass
|
620e218612
|
remove iframe.html
|
2022-02-15 20:19:45 +01:00 |
|
Alexis Faizeau
|
06dd2202f6
|
Fix hidden main cowebsite swape
|
2022-02-15 17:28:15 +01:00 |
|
Alexis Faizeau
|
a52ad233d8
|
Fix cowebsite swap
|
2022-02-15 17:28:02 +01:00 |
|
Alexis Faizeau
|
0f16d909e7
|
The second opened cowebsite must be displayed on highlighted
|
2022-02-15 17:27:32 +01:00 |
|
Lukas Hass
|
cdc3d182bc
|
fix comparison that is always false
|
2022-02-15 12:00:32 +01:00 |
|
Lukas Hass
|
8c96a986fb
|
remove webpack reference
|
2022-02-15 11:07:04 +01:00 |
|