Commit Graph

1750 Commits

Author SHA1 Message Date
_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 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
Alexis Faizeau d4470568ec Fix change layer api functions 2021-10-29 23:16:36 +02:00
_Bastler 47881a59ed Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-29 19:57:51 +02:00
_Bastler 6ed4a9bdc5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-29 19:57:47 +02:00
Alexis Faizeau f4df12e5ff Cowebsite properties manage by layer and not by property index 2021-10-29 19:45:03 +02:00
Alexis Faizeau 934e24f837 Implement on enter/leave layer events 2021-10-29 19:44:58 +02:00
David Négrier 60a82c5eb2 Merge pull request #1516 from thecodingmachine/iframeManager
Display multi co-websites
2021-10-29 15:33:56 +02:00
Alexis Faizeau e216b6caf4 Handle landscape mobile with cowebsite 2021-10-29 15:23:09 +02:00
_Bastler 7fb13cf54b santitize, popup class 2021-10-28 19:15:02 +02:00
_Bastler 24ac439fa1 default gameQuality 2021-10-27 19:30:42 +02:00
_Bastler 6a3d1fb1d5 login scene 2021-10-27 19:25:53 +02:00
_Bastler 178ba50876 fix login screen 2021-10-27 19:23:46 +02:00
_Bastler 07a02d9f16 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-27 19:17:23 +02:00
Gregoire Parant 6c0d8942e5 HotFix set last room for first connexion
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-10-27 16:48:33 +02:00
Gregoire Parant f8ae189cee HotFix handler message in chat store
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-10-27 14:29:39 +02:00
Gregoire Parant 385ea1360e Type Chat message Store
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-10-27 10:02:47 +02:00
Alexis Faizeau ab1a9b358a Change favicon snatcher http to https 2021-10-26 14:16:00 +02:00
Alexis Faizeau fb7fe0dc0a Rename cowebsite API functions 2021-10-25 19:00:26 +02:00
Alexis Faizeau fbff7491df Zoom x 2 thumbnail cowebsite 2021-10-25 19:00:26 +02:00
Alexis Faizeau f84c4b3276 Refacto insert cowebsite 2021-10-25 19:00:26 +02:00
Alexis Faizeau b81b1ff68b Implement new cowbesite system on API 2021-10-25 19:00:26 +02:00
Alexis Faizeau c29c4bfaa4 Fix onChatMessage subscriber 2021-10-25 19:00:26 +02:00
Alexis Faizeau da8cc661b7 Implement the new co website system 2021-10-25 19:00:26 +02:00
Alexis Faizeau 1ee0b28f66 Fix co website closing on exit zone 2021-10-25 19:00:26 +02:00
David Négrier 1efcbb4529 Merge pull request #1521 from thecodingmachine/change-player-depth
Change character depth to 0
2021-10-25 15:11:09 +02:00
_Bastler 89d8180cfe keep jitis circle 2021-10-22 09:40:16 +02:00