Commit Graph

4425 Commits

Author SHA1 Message Date
David Négrier
07a4df8ad4 Importing Window object back in Iframe API 2022-03-07 18:35:17 +01:00
David Négrier
ace7a684dc Adding "alpha" to the window Title 2022-03-07 18:10:26 +01:00
_Bastler
8c2eec87c7 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-04 08:20:25 +01:00
Anton Bracke
4535a8ae96
Merge remote-tracking branch 'upstream/develop' into electron 2022-03-03 14:43:33 +01:00
Valdo Romao
1181187271 Fixed discord links 2022-02-28 21:07:36 +01:00
_Bastler
e87052ecc6 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 19:12:42 +01:00
grégoire parant
9173a30f04
Merge pull request #1934 from thecodingmachine/oidcProfile
add OIDC username + locale
2022-02-28 15:18:47 +01:00
Lurkars
c8047bf4fa change to scope variable in enviroment 2022-02-28 14:56:44 +01:00
_Bastler
6faa31427b fix iframe 2022-02-28 14:52:44 +01:00
_Bastler
c2c01eb314 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-28 14:20:52 +01:00
_Bastler
653287bf78 fix prod. 2022-02-28 14:20:44 +01:00
_Bastler
ae376f25c4 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-28 14:16:09 +01:00
Lurkars
0a2bfc556f Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile 2022-02-28 10:35:15 +01:00
_Bastler
946a4d75e9 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-28 09:20:50 +01:00
Lurkars
c3b3d5e9d6
Fix nginx.conf to work with OIDC (#1932)
* fix nginx.conf to work with OIDC
* rewrite like .htaccess
2022-02-28 09:07:38 +01:00
_Bastler
8bc66723d5 fix nginx.conf 2022-02-27 14:52:57 +01:00
_Bastler
c12582c329 fix nginx.conf 2022-02-27 14:52:13 +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
d3df66b615 merge develop_vite 2022-02-27 14:39:06 +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
03ee2eb49a update dockerfile 2022-02-26 11:27:47 +01:00
_Bastler
36a4b140ba rename images 2022-02-26 11:19:48 +01:00
_Bastler
0e1dff6a11 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-26 11:11:51 +01:00
Lukas
f1cba60825
base front production image on official nginx image 2022-02-25 20:32:10 +01:00
Lukas
3f3af9b957
improve docker build caching
install dependencies before copying source into image
2022-02-25 18:53:14 +01:00
_Bastler
7e9196a8a0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-25 14:16:19 +01:00
David Négrier
3a9ce7615d
Merge pull request #1914 from thecodingmachine/dependabot/npm_and_yarn/front/ansi-regex-5.0.1
Bump ansi-regex from 5.0.0 to 5.0.1 in /front
2022-02-25 14:10:21 +01:00
grégoire parant
433f3ddd97
Merge pull request #1927 from thecodingmachine/calendar-meetings-doc
Documents the meetingRoomLabel property
2022-02-24 20:01:48 +01:00
grégoire parant
9da3c9c169
Merge pull request #1921 from thecodingmachine/fix-hash-parameter-from-standby
clear hashParams after moving player with moveTo param
2022-02-24 20:01:26 +01:00
Anton Bracke
af15490dd1
focus appView after opening 2022-02-24 12:11:48 +01:00
Benedicte Quimbert
b5c8214c22 Documents the meetingRoomLabel property 2022-02-23 18:27:16 +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
Anton Bracke
da6b5b9f60
fix leave server selected after opening once 2022-02-23 11:49:42 +01:00
Hanusiak Piotr
9fe4782fbd clear hashParams after moving player with moveTo param 2022-02-23 10:14:09 +01:00
grégoire parant
1691129441
Merge pull request #1919 from thecodingmachine/RefactorIconJitsi
Refactor how to use new Jitsi icon
2022-02-23 00:29:30 +01:00
Gregoire Parant
07d399403b Refactor how to use new Jitsi icon
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-23 00:27:07 +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
grégoire parant
437f35817a
Merge pull request #1918 from thecodingmachine/HotFixJitsiIcon
Hot fix jitsi icon
2022-02-22 23:38:25 +01:00
Gregoire Parant
3541f153fa Push Jitsi icon
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-22 23:37:28 +01:00
grégoire parant
0275bf912c
Merge pull request #1907 from thecodingmachine/HotFixAddCoWebsiteInformation
Update CoWebsite Jitsi
2022-02-22 23:30:38 +01:00
Anton Bracke
44a9e2aeb0
fix config loading 2022-02-22 20:24:09 +01:00
Anton Bracke
445bcaf130
fix linting 2022-02-22 20:07:36 +01:00
Anton Bracke
ce3d829041
fix type 2022-02-22 20:02:13 +01:00
Anton Bracke
92ec433539
fix resizing 2022-02-22 19:58:51 +01:00
Anton Bracke
67ef2abb24
fix default settings and window resizing 2022-02-22 19:51:52 +01:00
Anton Bracke
454ee6cf4c
nits, fixes 2022-02-22 19:01:26 +01:00
Anton Bracke
e82de63b34
remove unused lib 2022-02-22 18:41:08 +01:00