_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 |
|
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 |
|
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 |
|
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 |
|
dependabot[bot]
|
3aef82303c
|
Bump ansi-regex from 5.0.0 to 5.0.1 in /front
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)
---
updated-dependencies:
- dependency-name: ansi-regex
dependency-type: indirect
...
Signed-off-by: dependabot[bot] <support@github.com>
|
2022-02-21 16:27:29 +00:00 |
|
David Négrier
|
dfb2fca417
|
Merge pull request #1802 from lukashass/vite
Use vite for frontend development
|
2022-02-21 17:26:35 +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
|
ddf62107f2
|
Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure
|
2022-02-20 13:55:41 +01:00 |
|
_Bastler
|
90a69b0704
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop
|
2022-02-20 13:55:11 +01:00 |
|
_Bastler
|
667e3c0944
|
Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure
|
2022-02-20 13:28:29 +01:00 |
|
_Bastler
|
f7167537c3
|
fix dockerfile
|
2022-02-20 13:28:10 +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 |
|
David Négrier
|
f9ac8e0c18
|
Merge pull request #1903 from lukashass/improve-e2e
add playwright and run e2e tests on production-like environment
|
2022-02-19 18:57:59 +01:00 |
|
David Négrier
|
679a5d5504
|
Merge pull request #1898 from thecodingmachine/dependabot/npm_and_yarn/front/url-parse-1.5.7
Bump url-parse from 1.5.3 to 1.5.7 in /front
|
2022-02-19 18:17:24 +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 |
|
grégoire parant
|
1f7302be95
|
Merge pull request #1904 from thecodingmachine/HotFixToEnableFreemiumLimitation
Enable limitation freemium
|
2022-02-18 22:19:44 +01:00 |
|