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

2017 Commits

Author SHA1 Message Date
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
Alexis Faizeau
dbd6ce5bdc Fix player movement tests 2021-10-29 23:30:02 +02: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
Alexis Faizeau
68c626088d Add co-website icon on mobile landscape 2021-10-28 11:31:28 +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
_Bastler
f984897e80 secure DISABLE_ANONYMOUS 2021-10-21 16:23:42 +02:00
_Bastler
a1338d40fb Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-18 15:02:22 +02:00
David Négrier
b6d571500e
Merge pull request #1528 from thecodingmachine/api_chat_multiple_virtual_users 
When there are many virtual users (generated by chat), only the name of a first user is displayed.
 2021-10-18 15:02:21 +02:00
David Négrier
4a40c08578 Fixing chat message attributed to wrong user 
When a new user entered a chat message, the message was still attributed to the last user who wrote.
 2021-10-18 14:58:29 +02:00
_Bastler
b74e122409 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-18 14:57:20 +02:00
David Négrier
4abf7208ff
Merge pull request #1524 from thecodingmachine/player-direction 
Display the real sprite direction on character loaded
 2021-10-18 14:37:01 +02:00
Alexis Faizeau
c13839ce8d Display the real sprite direction on character loaded 2021-10-15 16:35:42 +02:00
_Bastler
fd6b5220f0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-15 16:33:44 +02:00
David Négrier
958fc9eee8
Merge pull request #1523 from thecodingmachine/fix_back_forth_localhost 
Fixing exit problem on localhost maps
 2021-10-15 16:27:32 +02:00
David Négrier
70d5c7f658 Triggering onload even if file already loaded for files loaded via http:// 2021-10-15 16:14:17 +02:00
_Bastler
315be013e6 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-15 16:07:01 +02:00
grégoire parant
79e83d3782
Merge pull request #1522 from thecodingmachine/HotFixContactPage 
Fix share link for website
 2021-10-15 15:44:44 +02:00
Gregoire Parant
a8d6024352 Fix share link for website 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-15 15:25:23 +02:00
David Négrier
79a5916057 Removing dead code 2021-10-15 15:08:06 +02:00
Gregoire Parant
497a7c3467 Fix typo emails => email 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-14 17:33:53 +02:00
Alexis Faizeau
cdf4023928 Change character depth to 0 2021-10-14 17:32:27 +02:00
Gregoire Parant
b7692dd355 Fix local user useless 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-14 17:25:36 +02:00
Gregoire Parant
f87422187f HotFix user data connection 
Create local store for user connected in SSO

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-14 17:22:43 +02:00
_Bastler
78161bd98a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-13 10:30:12 +02:00
Kharhamel
726f52976d FEATURE: analytics client now scrape user email and room group 2021-10-11 16:30:01 +02:00
_Bastler
d5f61199c7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-11 13:03:20 +02:00
Kharhamel
57bfc1001f FIX: edited changelog 2021-10-11 11:34:10 +02:00
_Bastler
15766e521e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-10 10:30:04 +02:00
Kharhamel
59fa68e063 FIX: updated posthog client version and fixed a bug with its toolbar 2021-10-08 11:55:27 +02:00
_Bastler
448fd61426 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-07 15:01:11 +02:00
Kharhamel
60eefbce94
Merge pull request #1508 from thecodingmachine/fixSilentZones 
FIX: being in a silent zone new forces mediaConstraints to false
 2021-10-07 14:50:40 +02:00
Kharhamel
9dd3e8ff85 FIX: being in a silent zone new forces mediaConstraints to false 2021-10-06 17:59:20 +02:00
_Bastler
fa61e42b1d Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-06 16:16:12 +02:00
_Bastler
51a774fb84 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-06 16:02:36 +02:00
grégoire parant
900c53f499
Update icon message and profile (#1504) 
- Add new icon profil pixel
 - Add new icon message pixel
 - Migrate message icon in svelt menu

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-06 15:36:42 +02:00
grégoire parant
358d9a79d3
Add condition Hash for start layer (#1506) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-05 23:34:18 +02:00
grégoire parant
908b78fdda
HotFix mandatory login with ADMIN openid connexion (#1503) 
Before anonymous connexion, we must get the details of the map and permit to check mandatory connexion and redirect user to login page.

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-05 18:59:26 +02:00
_Bastler
f25cb6a3ba Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-04 20:57:12 +02:00
grégoire parant
b33e271d2e
Merge pull request #1499 from thecodingmachine/develop 
Release 1.5.3
 2021-10-04 20:54:13 +02:00
Kharhamel
02108ce977 FIX: fixes for the emnote menu 2021-10-04 14:43:19 +02:00
_Bastler
735c30b5a5 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-10-03 21:18:46 +02:00
Kharhamel
7bb0175648
FIX: we now make sure to completly disable the old stream before attempting to create a new one (#1493) 
* FIX: we now make sure to completly disable the old stream before attempting to create a new one

* FIX: disable audio optimization on chrome

* always reemit the stream on chrome

* Try fix on stop current stream

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Try fix on stop current stream

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

* Push fix microphone

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-10-02 23:58:33 +02:00
Alexis Faizeau
8c3b708981
Remove audio manager range volume control by keys (#1489) 
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
 2021-10-02 15:55:54 +02:00
grégoire parant
1e69bb0f49
Manage redirect URL from admin and save in hydra via pusher (#1492) 
Add redirect parameter url to connect user directly on private openId application

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-30 11:16:25 +02:00
_Bastler
99619cf140 update dockerfile 2021-09-28 09:51:53 +02:00
_Bastler
bb7f83cee6 added world menu 2021-09-28 09:44:11 +02:00
David Négrier
2b5211d098
Merge pull request #1486 from thecodingmachine/fix-links 
Fixing links in the documentation
 2021-09-27 15:41:23 +02:00
David Négrier
b8996d5abb Fixing links in the documentation 2021-09-27 11:13:35 +02:00
Kharhamel
ce26294250 FIX: initPositionFromLayerName will now prioritize its target layer rather than the start layer 2021-09-24 11:54:19 +02:00
_Bastler
5e6ffd9fa2 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-23 18:47:36 +02:00
Kharhamel
bf0c333266
Merge pull request #1463 from thecodingmachine/dependabot/npm_and_yarn/front/axios-0.21.2 
Bump axios from 0.21.1 to 0.21.2 in /front
 2021-09-23 18:36:51 +02:00
_Bastler
3b4cf0a68c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-21 21:10:09 +02:00
GRL78
3f1c5246f8
TO MERGE : Contact page from Admin or Environment Variable (#1401) 
* Contact page from Admin or Environment Variable

* Get contact page from admin by pusher

* Changes requested

* Modify contactPageStore management

* documentation environment variables

Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-21 20:24:53 +02:00