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

1938 Commits

Author SHA1 Message Date
_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
_Bastler
d305a91ffd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-21 19:47:56 +02:00
Kharhamel
8b099e5725 FIX: added another catch case for default model 2021-09-21 14:29:15 +02:00
Gregoire Parant
3f954d273c Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-21 02:37:56 +02:00
grégoire parant
e77d4dda84
Update favicon and logo to deploy new design (#1475) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-20 22:42:15 +02:00
_Bastler
d3a24b06c2 change room slug 2021-09-20 19:31:51 +02:00
_Bastler
0164d24329 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 16:25:25 +02:00
Lurkars
781c69387c fix wrong font name 2021-09-20 15:22:54 +02:00
_Bastler
49bd6f8a1c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 15:17:30 +02:00
_Bastler
31579283cd fix connection type 2021-09-20 15:06:44 +02:00
dependabot[bot]
8ecef9eadc
Bump axios from 0.21.1 to 0.21.2 in /front 
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-20 12:34:07 +00:00
Kharhamel
9b13a6780c
Merge pull request #1437 from Lurkars/twemojiEmoteMenuSvelte 
Twemoji emote menu svelte (upgrade of #1301)
 2021-09-20 14:33:16 +02:00
_Bastler
54346896b9 fix 2021-09-20 09:53:25 +02:00
_Bastler
1e43229956 fix? 2021-09-20 09:33:50 +02:00
_Bastler
afa12641aa undo 2021-09-20 09:30:36 +02:00
_Bastler
9650453edc quick fix 2021-09-20 09:27:18 +02:00
_Bastler
22c501e5e0 quick fix? 2021-09-20 09:24:47 +02:00
_Bastler
6af1651e03 remove instance, change room url, fix invalid lastRoomUrls 2021-09-20 08:56:14 +02:00
_Bastler
ccafaf11e3 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 08:55:41 +02:00
grégoire parant
8c96b514d4
HotFix to test hydra connexion (#1471) 2021-09-18 11:35:29 +02:00
_Bastler
0c16f08f4e fix quill build 2021-09-17 15:52:07 +02:00
_Bastler
7504580e43 fix quill.css 2021-09-17 15:47:17 +02:00
_Bastler
29b9d29b7d add quill css 2021-09-17 15:41:48 +02:00
_Bastler
ea64e79e46 fix localuser for OIDC 2021-09-17 14:02:43 +02:00
_Bastler
f053ece7da remove old, fix nginx 2021-09-17 10:23:00 +02:00
_Bastler
0bf49fa26a native OIDC support 2021-09-17 09:46:04 +02:00
_Bastler
3a9ffd7557 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-16 18:39:06 +02:00
_Bastler
b47201687a better we.bslty & deveop integration 2021-09-16 18:24:03 +02:00
Lurkars
63c4eeb4c7 Merge branch 'twemojiEmoteMenuSvelte' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:20:42 +02:00
Lurkars
7922de10ff Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:12:51 +02:00
grégoire parant
553902e52a
Add log for Oauth login connexion (#1468) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-16 17:57:14 +02:00
Kharhamel
483191c521
Merge pull request #1458 from thecodingmachine/posthog 
FEATURE: added posthog as new analytics tool
 2021-09-16 15:24:27 +02:00
Kharhamel
2e111aa13a FEATURE: added posthog as new analytics tool 2021-09-16 15:16:10 +02:00
_Bastler
f69fe463de Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-15 16:52:39 +02:00
David Négrier
801ec3bf4c Turn off audio on exit 
If an exit zone is overlapping an audio zone, when exiting, the audio is stopped.
We do this by actually triggering the fact that a user should "leave" all active zones when exiting.
 2021-09-15 15:28:55 +02:00
_Bastler
63e756c1d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-15 13:08:33 +02:00
David Négrier
8a6419a3b7
Merge pull request #1457 from thecodingmachine/fix_yarn_not_working 
fix yarn install not working
 2021-09-15 11:50:50 +02:00
David Négrier
bb8583872b Fixing messages generation in Front container 2021-09-15 11:32:32 +02:00
David Négrier
0c374aba48
Merge pull request #1456 from thecodingmachine/jitsi-silent 
Fixing silent zone not respected when exiting Jitsi
 2021-09-15 11:27:50 +02:00
David Négrier
d26325d8dc Fixing silent zone not respected when exiting Jitsi 
Now, when a silent zone is adjacent to a Jitsi, it is enforced, even after leaving the Jitsi zone
 2021-09-15 11:16:23 +02:00
TabascoEye
5a855fb7e4
fix yarn install not working 
problem for virtually all people trying self-hosting according to #1433, #738 and likely more
 2021-09-15 10:43:01 +02:00
_Bastler
025722db63 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-14 18:38:00 +02:00
GRL78
680e538fd6
save button in settings close menu (#1451) 2021-09-14 16:43:00 +02:00
_Bastler
67d0802d1b Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-14 14:41:41 +02:00
David Négrier
9006283c90
Merge pull request #1452 from Lurkars/audioPlayerImprovements 
some fixes on the audio player controls
 2021-09-14 14:41:40 +02:00
_Bastler
b256431828 action message html 2021-09-14 13:08:25 +02:00
_Bastler
0067a8edc2 fix external resources for twemoji 2021-09-14 11:44:45 +02:00
Lurkars
8c780f07c6 fix font 2021-09-14 11:41:51 +02:00
Lurkars
f1bd92fa52 use included twemoji mozilla font instead of loading external 2021-09-14 11:39:36 +02:00
GRL
ff3e844b68 chat scroll to bottom when it open 2021-09-14 09:36:49 +02:00
_Bastler
148540dafe emojimenu, audiomanager 2021-09-14 08:56:37 +02:00
Lurkars
34d81b0e6c fix behaviour 2021-09-14 08:55:15 +02:00
Lurkars
91bc524e06 disable controls 2021-09-14 08:50:43 +02:00
_Bastler
cf69b3259a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-14 08:17:37 +02:00
Lurkars
beed50874b fix emotemenu on open jitsi rooms 2021-09-13 19:16:47 +02:00
David Négrier
f92b728a8e Fixing broken chat API 2021-09-13 14:50:02 +02:00
_Bastler
15404015f1 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-13 11:11:52 +02:00
David Négrier
f0b83663f6 Fixing broken sound controls 
Because of the rework of the menu, the clickable zone for the menu was extending at the complete top of the screen, which caused interactive items at the top of the screen (like sound controls) to be broken.

This commit fixes this.
 2021-09-13 10:06:08 +02:00
Lurkars
59c22c8dfc svelte check fix 2021-09-12 11:29:53 +02:00
Lurkars
e5b3088b5e Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-12 11:22:46 +02:00
Lurkars
3080e1fdc7 improvements on svelte store + handling 2021-09-12 11:11:52 +02:00
TabascoEye
94517c0f4b
add the possibilities of "onaction" and message to new "openTab" property 2021-09-10 23:17:04 +02:00
_Bastler
90f7258c9a Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-10 17:14:59 +02:00
_Bastler
6c8d268b05 update Svelte twemoji 2021-09-10 17:11:37 +02:00
_Bastler
bb3b58d8bf Twemoji Svelte 2021-09-10 17:06:46 +02:00
Lurkars
e553392d9d move twemoji menu to svelte 2021-09-10 16:57:21 +02:00
Kharhamel
d071f5fa90 FIX: the video element should not have a bigger height than its container 2021-09-10 16:04:15 +02:00
Lurkars
d23820227e Merge branch 'twemojiEmoteMenu' of github.com:Lurkars/workadventure into twemojiEmoteMenuSvelte 2021-09-10 14:58:49 +02:00
_Bastler
e5aef085fa Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 12:38:11 +02:00
_Bastler
2fd8eb3c91 fix flatten layers 2021-09-09 08:56:26 +02:00
Lurkars
36df585a5e fix wrong layer names after re-enter room 2021-09-09 08:47:38 +02:00
_Bastler
52489f9c72 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 08:25:41 +02:00
Gregoire Parant
3a3e5d5f3b Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Components/Menu/Menu.svelte
#	front/src/Components/Menu/ProfileSubMenu.svelte
#	front/src/Components/Menu/SettingsSubMenu.svelte
#	front/src/Connexion/ConnectionManager.ts
#	front/src/Stores/MediaStore.ts
#	front/src/Stores/MenuStore.ts
#	front/style/TextGlobalMessageSvelte-Style.scss
#	front/style/style.scss
 2021-09-08 18:20:13 +02:00
GRL78
2ea7b0cff1
Menu style will adapt if iframe in map is opened (#1422) 2021-09-08 15:43:46 +02:00
grégoire parant
6cf86ec8dc
Add play uri for login and register in hydra (#1421) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-08 13:39:46 +02:00
_Bastler
bfc476fedd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-08 10:03:13 +02:00
kharhamel
fa9929757d FIX: reimplemented the old stream behavior on bad navigators like chrome 2021-09-07 16:39:44 +02:00
grégoire parant
f60678478b
Update right css (#1416) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-07 13:59:08 +02:00
_Bastler
4913010273 fix drinks 2021-09-06 20:15:41 +02:00
_Bastler
64613b076e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-06 18:49:47 +02:00