_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,298 Commits 2 Branches 0 Tags 47 MiB
bc7d9a96fe
Commit Graph

3298 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_Bastler
bc7d9a96fe fix keepCircle Property 2021-11-24 13:06:43 +01:00
_Bastler
3b98888c3a merge latest dev 2021-11-24 13:00:27 +01:00
_Bastler
1873ac1836 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-24 11:18:29 +01:00
grégoire parant
29c0b57f0c
Merge pull request #1573 from thecodingmachine/PostHogNewAction 
Add new action post hog
 2021-11-24 10:02:34 +01:00
Gregoire Parant
ecc6321e17 Add new action post hog 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-18 11:39:56 +01:00
_Bastler
347156a3ea Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-17 19:34:31 +01:00
David Négrier
3487fa90e0
Merge pull request #1570 from thecodingmachine/fixZoom 
Fix zoom
 2021-11-17 16:19:26 +01:00
Alexis Faizeau
44c99fb0ef Fix zoom from cowebsite changes 2021-11-17 15:26:58 +01:00
_Bastler
a6891b704c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-17 09:28:11 +01:00
grégoire parant
80c314bb9e
Merge pull request #1568 from thecodingmachine/master 
Master release 1.6.0
 2021-11-17 02:23:27 +01:00
grégoire parant
26fa566d85
Change 'access-control-allow-origin' to FRONT_URL env variavle (#1567) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-17 02:21:58 +01:00
grégoire parant
75ba9ddae8
HotFix Allow Origin header for CORS (#1566) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 18:38:18 +01:00
grégoire parant
f6b8677c2e
Merge pull request #1565 from thecodingmachine/HotFixCreditPage 
Update design of credit page
 2021-11-16 15:33:35 +01:00
Gregoire Parant
e5979998c5 Update design of credit page 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 15:28:54 +01:00
grégoire parant
7d73ca321d
Merge pull request #1564 from thecodingmachine/HotFixAuthenticationManager 
Hot fix authentication manager
 2021-11-16 15:17:46 +01:00
Gregoire Parant
0614fa7b47 HotFix copy link to share it 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 15:03:54 +01:00
Gregoire Parant
e54732be1b HotFix authentication manager to get data from back 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 14:46:32 +01:00
grégoire parant
6fafb727ba
Merge pull request #1563 from thecodingmachine/HotFixConnexionManager 
HotFix connexion manager
 2021-11-16 13:31:43 +01:00
Gregoire Parant
ba89d9b122 HotFix DISABLED_ROOM for env variable 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 13:18:40 +01:00
Gregoire Parant
8768374460 HotFix connexion manager 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 13:14:40 +01:00
grégoire parant
832c4ab300
Merge pull request #1562 from thecodingmachine/HotFixNewJwtTokenDecrypted 
HotFix encrypted and decrypted error
 2021-11-16 11:26:35 +01:00
Gregoire Parant
ec1cc92c8b replace console log by error 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 11:23:18 +01:00
Gregoire Parant
c1dc438138 HotFix encrypted and decrypted error 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-16 11:14:27 +01:00
_Bastler
13dafdf14b update Dockerfile 2021-11-16 11:06:20 +01:00
_Bastler
e43e1d8463 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-16 10:56:33 +01:00
David Négrier
78698ff17f
Merge pull request #1551 from thecodingmachine/deprecate-onenterzone 
Updates API documentation (other than room) following onEnterZone & onLeaveZone deprecation
 2021-11-15 17:37:05 +01:00
grégoire parant
9bdda210f5
Merge pull request #1561 from thecodingmachine/develop 
Release v1.6.0
 2021-11-15 16:51:48 +01:00
Gregoire Parant
d3964ae25b HotFix conflict merging 2021-11-15 16:36:10 +01:00
Gregoire Parant
20164417fb Change data by resCheckTokenAuth 2021-11-15 16:34:23 +01:00
David Négrier
4e042389c5 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 
# Conflicts:
#	front/src/Connexion/ConnectionManager.ts
#	pusher/src/Controller/AuthenticateController.ts
#	pusher/src/Controller/IoSocketController.ts
#	pusher/src/Services/JWTTokenManager.ts
 2021-11-15 16:30:45 +01:00
David Négrier
578fa21591
Merge pull request #1543 from thecodingmachine/fixAdminSocket 
FIX: the admin sockets now uses a short live to check room authorization
 2021-11-15 16:21:20 +01:00
David Négrier
8b6c16fd30
Merge pull request #1553 from thecodingmachine/openidAdminConnect 
OpenId & Admin connect
 2021-11-15 16:20:00 +01:00
Gregoire Parant
210a789aa4 Fix feedback @moufmouf 2021-11-15 15:58:08 +01:00
grégoire parant
a4b8a8422f
Merge pull request #1559 from thecodingmachine/openIdDisabledAnonymousSelfHost 
Open id disabled anonymous self hosted
 2021-11-15 15:29:55 +01:00
Gregoire Parant
bbc2ac2550 Update Connection manager to clean url history of navigator 2021-11-15 15:25:49 +01:00
Gregoire Parant
61b8d584af delete useless userIdentify 2021-11-15 14:34:23 +01:00
Gregoire Parant
16c08d86f2 Update hydraAccessToken to accessToken 2021-11-15 12:30:25 +01:00
Gregoire Parant
7d0b573d37 Define profile variable to show user connected 
- OPID_PROFILE_SCREEN_PROVIDER is a variable to show profile of user connected. You can defined your own provider or use classic provider of WorkAdventure.
 - OpenIdProfileController with url "/profile" get user data and create simple html to show user informations. This url will be called with params 'accessToken'
 - If you define your custom profile url, it will be called with param 'accessToken'.

accessToken is token to access at user informations in your OpenId provider.
 2021-11-12 20:48:26 +01:00
Gregoire Parant
15cdc54ec3 Add evnvironment Enum for OPID_LOGIN_SCREEN_PROVIDER variable 2021-11-12 19:36:37 +01:00
Gregoire Parant
f905426ebd Add new variable login provider to connect user 2021-11-12 19:36:13 +01:00
Gregoire Parant
24a1f324c7 Add OpenId login url and provider to login user 2021-11-12 19:35:34 +01:00
Gregoire Parant
e073d70098 Merge branch 'develop' into openidAdminConnect 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-12 17:01:26 +01:00
Gregoire Parant
ca74f92051 Pull open id admin from @GRP 2021-11-12 16:59:34 +01:00
Gregoire Parant
c21ea8803a Add OPID redirect url 
Is important to defined redirect url to be connected with openid provider
 2021-11-12 16:52:44 +01:00
Gregoire Parant
213af0cfa3 Changes ANONYMOUS dynamic variable 2021-11-12 16:47:39 +01:00
Gregoire Parant
fa233e13c6 Changes ANONYMOUS variable 
This variable will be use to mandatory login user in self hosted
 2021-11-12 16:43:37 +01:00
grégoire parant
c1788424b5
Merge pull request #1533 from Lurkars/oidcRequired 
use OIDC without admin api, option to disable anonymous login

Thanks for your work @Lurkars. I will take your changes and apply some update. When I will finish, I will  share you the result and requirement for mounting correct openid connection with puhser and without ADMIN part 💪  🚀
 2021-11-12 16:39:15 +01:00
Gregoire Parant
461dee776c Update css 2021-11-12 16:22:37 +01:00
Gregoire Parant
49f68451ae Update profile menu and change UX 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-12 15:31:49 +01:00
Gregoire Parant
d3f120f2bb Update to have token when user is connected 
- Update menu design

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-11-12 12:13:44 +01:00