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

2891 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kharhamel
d2bf7b8fde
Merge pull request #1465 from thecodingmachine/dependabot/npm_and_yarn/pusher/axios-0.21.2 
Bump axios from 0.21.1 to 0.21.2 in /pusher
 2021-09-23 18:36:34 +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
Kharhamel
ccea46fe2b
Merge pull request #1476 from thecodingmachine/fixCustomWoka 
FIX: added another catch case for default model
 2021-09-21 17:45:31 +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
Kharhamel
2fbf8f0a10
Merge pull request #1474 from Lurkars/twemojiEmoteMenuSvelte 
fix wrong font name
 2021-09-20 15:54:31 +02:00
Lurkars
781c69387c fix wrong font name 2021-09-20 15:22:54 +02:00
dependabot[bot]
62c163f11e
Bump axios from 0.21.1 to 0.21.2 in /pusher 
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:04 +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
Gregoire Parant
f247ec44f1 Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-18 12:20:02 +02:00
grégoire parant
8c96b514d4
HotFix to test hydra connexion (#1471) 2021-09-18 11:35:29 +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
David Négrier
9f39cf154a
Merge pull request #1467 from thecodingmachine/master 
Backporting changes to develop
 2021-09-16 17:49:05 +02:00
David Négrier
8d0f53ada0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-16 17:04:43 +02:00
David Négrier
bc45c93932 Fixing Posthog env var 2021-09-16 17:03:49 +02:00
David Négrier
7ef27a0040 Updating Changelog 2021-09-16 16:46:48 +02:00
David Négrier
4728c3a59a Merge branch 'master' of github.com:thecodingmachine/workadventure 2021-09-16 16:46:27 +02:00
David Négrier
950ffaafda
Merge pull request #1466 from thecodingmachine/develop 
Deploy 2021-09-16
 2021-09-16 16:22:50 +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
David Négrier
a3eebb05ba Fixing type of openWebsiteWidth in doc 2021-09-16 09:58:42 +02:00
David Négrier
74b5e2797f
Merge pull request #1459 from thecodingmachine/turn_off_audio_on_exit 
Turn off audio on exit
 2021-09-15 15:35:37 +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
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
GRL78
680e538fd6
save button in settings close menu (#1451) 2021-09-14 16:43:00 +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
David Négrier
6ed4857b1d
Merge pull request #1450 from thecodingmachine/fixScrollChat 
Chat scroll to bottom when it open
 2021-09-14 14:39:42 +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
Lurkars
34d81b0e6c fix behaviour 2021-09-14 08:55:15 +02:00
Lurkars
91bc524e06 disable controls 2021-09-14 08:50:43 +02:00
Lurkars
beed50874b fix emotemenu on open jitsi rooms 2021-09-13 19:16:47 +02:00
David Négrier
01bd36ca3f Removing test in double 2021-09-13 18:58:00 +02:00
David Négrier
7cf9f8ff10
Merge pull request #1447 from thecodingmachine/fix_api_chat 
Fixing broken chat API
 2021-09-13 15:57:37 +02:00
David Négrier
f92b728a8e Fixing broken chat API 2021-09-13 14:50:02 +02:00
David Négrier
fae57e36e3
Merge pull request #1446 from thecodingmachine/develop 
Deploy 2021-09-13
 2021-09-13 11:27:22 +02:00
David Négrier
8b4764912a Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-09-13 10:47:02 +02:00
David Négrier
e3896bf5e7 Adding features to CHANGELOG 2021-09-13 10:45:32 +02:00
David Négrier
3be328af35
Merge pull request #1445 from thecodingmachine/fix-menu-pointer-too-large 
Fixing broken sound controls
 2021-09-13 10:38:42 +02:00
David Négrier
fbddd54059 Adding a test case for audio 2021-09-13 10:22:55 +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
David Négrier
bfd418d8b5
Merge pull request #1436 from thecodingmachine/better_test_page 
Adding more tests
 2021-09-13 09:25:58 +02:00