367 Commits

Author SHA1 Message Date
Hanusiak Piotr 5706e5c416 remove console logs 2022-03-03 12:31:17 +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
Lurkars c8047bf4fa change to scope variable in enviroment 2022-02-28 14:56:44 +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 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
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
David Négrier da469b64d2 Working on integration of the woka-list with the new admin endpoint. 2022-02-24 21:09:19 +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
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 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
_Bastler ac4f16ad03 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-23 17:07:14 +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 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 c878dab09b oidc improvments 2022-02-16 09:16:40 +01:00
Lurkars 2816946c94 add OIDC username + locale 2022-02-16 09:11:08 +01:00
_Bastler f2c90c5adc Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-15 09:27:21 +01:00
David Négrier e801e2a435 Merge pull request #1876 from thecodingmachine/fix_pusher_header
pusher: add missing Content-Type header for json responses (2)
2022-02-15 09:25:31 +01:00
David Négrier 4bcdbcb1bd Fixing linting 2022-02-15 09:15:41 +01:00
_Bastler 9cfe75f4d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-15 08:14:24 +01:00
Ludwig Behm 9073024b1d pusher: add missing Content-Type header for json responses 2022-02-14 00:53:38 +01:00
dependabot[bot] 2cb7c518c1 Bump follow-redirects from 1.14.7 to 1.14.8 in /pusher
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-13 21:56:46 +00:00
Gregoire Parant 64ba7575a0 Add play uri param
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-08 18:47:11 +01:00
_Bastler ed687bf3bf Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-27 19:09:17 +01:00
David Négrier f5464fb1af Fixing bad return in controller 2022-01-27 18:46:28 +01:00
David Négrier 12d6d9a50d Disabling completely routes if admin token not configured 2022-01-27 18:38:33 +01:00
_Bastler 7e987ad470 latest dev + i18n 2022-01-27 13:03:59 +01:00
_Bastler f2da041b7c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-25 21:09:48 +01:00
dependabot[bot] 6684c87efa Bump node-fetch from 2.6.1 to 2.6.7 in /pusher
Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.1 to 2.6.7.
- [Release notes](https://github.com/node-fetch/node-fetch/releases)
- [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.1...v2.6.7)

---
updated-dependencies:
- dependency-name: node-fetch
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-24 16:54:59 +00:00
_Bastler ed28cd0882 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-14 10:43:49 +01:00
dependabot[bot] 201d804d98 Bump follow-redirects from 1.14.4 to 1.14.7 in /pusher
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-14 09:27:12 +00:00
_Bastler 04a334c8e7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-12 10:56:50 +01:00
Alexis Faizeau 3f3f488924 Merge pull request #1718 from thecodingmachine/master
Hot fixes
2022-01-12 10:47:27 +01:00
_Bastler 7a12e48e70 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-10 15:42:59 +01:00
Alban Bruder 4a78e449df Fix circular serialization in pusher dump endpoint 2022-01-07 14:37:44 +01:00