_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,786 Commits 2 Branches 0 Tags
1fbba8a4537e5c4ae2c3752992e0280e75246faa
Commit Graph

4786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_Bastler ae376f25c4 Merge branch 'develop' of ssh://git.bstly.de:222/_Bastler/partey_workadventure 2022-02-28 14:16:09 +01:00
Hanusiak Piotr 724dbc8efa send group userIds to players 2022-02-28 13:47:08 +01:00
Alexis Faizeau 4091606f75 Remove async on pusher option method 2022-02-28 12:09:15 +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
Alexis Faizeau 394f721638 Add position on default woka data 2022-02-25 19:28:21 +01:00
Lukas 3f3af9b957 improve docker build caching 
install dependencies before copying source into image
 2022-02-25 18:53:14 +01:00
David Négrier 08fffab410 Switching from "name" to "id" in texture object + using zod for woka/list validation 2022-02-25 17:05:34 +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
David Négrier da469b64d2 Working on integration of the woka-list with the new admin endpoint. 2022-02-24 21:09:19 +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
Alexis Faizeau 0543232bc3 Change error wording on pusher 2022-02-24 14:54:36 +01:00
Alexis Faizeau 586e829e2e Fix woka endpoints on pusher 2022-02-24 14:11:28 +01:00
David Négrier c37046e138 Fixing regex 2022-02-24 12:15:23 +01:00
Anton Bracke af15490dd1 focus appView after opening 2022-02-24 12:11:48 +01:00
David Négrier 1b286002ff Cleaning commented code 2022-02-24 12:10:49 +01:00
David Négrier 8e11c4445b Sending character layer details to admin 2022-02-24 10:25:14 +01:00
David Négrier 378a95962a Heavy changes: refactoring the pusher to always send the textures (and the front to accept them) 2022-02-23 21:13:11 +01:00
Hanusiak Piotr d65fe0ee26 fetch textures every time character or customize scene is open 2022-02-23 19:53:55 +01:00
Hanusiak Piotr 063de6d1ca playerTextures metadata is being loaded via Phaser.Loader 2022-02-23 19:53:55 +01:00
Hanusiak Piotr 52e15eccfa revert FRONT_URL 2022-02-23 19:53:54 +01:00
David Négrier 3b4f06d659 Adding OpenAPI documentation for the pusher. 
The pusher now exposes a "/openapi" endpoint and a "/swagger-ui/" endpoint.
 2022-02-23 19:53:54 +01:00
Hanusiak Piotr 80761804a7 getting textures urls from pusher 2022-02-23 19:53:54 +01:00
Alexis Faizeau 2161a40e05 Add endpoints on pusher to resolve wokas 2022-02-23 19:53:54 +01:00
Alexis Faizeau f993aa4f5a Wrap websockets with HyperExpress 2022-02-23 19:53:53 +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 8d8857011e removed unused imports 2022-02-23 14:40:19 +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