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

2846 Commits

Author SHA1 Message Date
Alexis Faizeau 9300b05335 Fix woka list url 2022-03-04 10:52:32 +01:00
Hanusiak Piotr 3c74b2b554 remove obsolete check 2022-03-03 15:21:44 +01:00
Anton Bracke 4535a8ae96 Merge remote-tracking branch 'upstream/develop' into electron 2022-03-03 14:43:33 +01:00
Hanusiak Piotr 363b906cb8 group circles with color fill 2022-03-03 14:36:16 +01:00
Hanusiak Piotr a0535ed4a8 Updating GroupDescriptors on LockGroupMessage 2022-03-03 12:22:16 +01:00
Hanusiak Piotr a0205bf682 cleanup 2022-03-02 17:00:43 +01:00
Hanusiak Piotr ef22d4ba20 listening to lockGroupMessage on front 2022-03-02 10:44:26 +01:00
Hanusiak Piotr d43c8d181a sending info about group lock state. wip 2022-03-01 11:36:45 +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
_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
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 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
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
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
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
_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
Hanusiak Piotr 9fe4782fbd clear hashParams after moving player with moveTo param 2022-02-23 10:14:09 +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
Gregoire Parant 3541f153fa Push Jitsi icon 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-22 23:37:28 +01:00
Anton Bracke 4e243151dd add desktop api to front 2022-02-22 16:57:56 +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
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