Commit Graph

2493 Commits

Author SHA1 Message Date
David Négrier 7c6105d93a Making the loader resizable
This way, if the window is resized while loading, the loading bar will stay in the middle
2021-11-24 15:21:07 +01:00
Alexis Faizeau 24640d13bb Fix removing of co-website action trigger 2021-11-24 14:50:19 +01:00
_Bastler 16a73d4de6 getMapProperty 2021-11-24 14:32:45 +01:00
_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
David Négrier 2f632ae472 Merge pull request #1580 from thecodingmachine/fix-tab
Fix tab index on embedded iframes
2021-11-24 12:17:25 +01:00
Alexis Faizeau 6a7385947d Fix authentication mandatory 2021-11-24 11:55:28 +01:00
_Bastler 1873ac1836 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-24 11:18:29 +01:00
Alexis Faizeau 4ca763c028 Fix tab index on embbed iframes 2021-11-24 11:05:18 +01:00
David Négrier 550ffaf8a8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into end-to-end-tests
# Conflicts:
#	front/src/Administration/AnalyticsClient.ts
2021-11-24 11:01:50 +01:00
David Négrier 806b97afab Refactoring Analytics to remove errors 2021-11-24 10:21:19 +01:00
David Négrier a82f4e1813 Adding end-to-end tests
The first test is testing a tricky cache scenario with the back when testing variables.
The end-to-end package used is testcafe.
2021-11-23 15:43: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
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
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
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
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
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
Gregoire Parant d3964ae25b HotFix conflict merging 2021-11-15 16:36:10 +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
Gregoire Parant 210a789aa4 Fix feedback @moufmouf 2021-11-15 15:58:08 +01:00
Gregoire Parant bbc2ac2550 Update Connection manager to clean url history of navigator 2021-11-15 15:25:49 +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 ca74f92051 Pull open id admin from @GRP 2021-11-12 16:59:34 +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
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
_Bastler 72e7f1bdd5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-10 19:31:44 +01:00
Gregoire Parant 1db22d82af Set state in local storage when openid provider redirect on jwt with token value
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-10 18:26:50 +01:00
David Négrier ee4ec7ba97 Merge pull request #1555 from thecodingmachine/iconserver
Add iconserver in services
2021-11-10 18:12:47 +01:00
Alexis Faizeau 624593e425 Implement twemoji on emote 2021-11-10 16:55:20 +01:00
Alexis Faizeau 1c48feeb61 Add iconserver in services 2021-11-10 16:46:13 +01:00
Gregoire Parant 7406b62093 Add jwt token if is defined un URL
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-09 00:38:32 +01:00
Gregoire Parant 89baafba2f Rollback openid connect to use code and nonce
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-09 00:08:01 +01:00
_Bastler 0d811db668 latest dev 2021-11-05 18:44:33 +01:00
_Bastler af855344f4 redo message trigger for co-websites 2021-11-03 17:30:13 +01:00
_Bastler a3937fc17f Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-03 11:21:41 +01:00
Alexis Faizeau 5a3d510f05 Create GameMapProperties index 2021-11-02 10:52:25 +01:00
_Bastler a044afd34c fix cowebsite 2021-11-01 19:14:53 +01:00
_Bastler 00d9df1f4e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-11-01 17:51:12 +01:00