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

3113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_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
352b05b1ea
Merge pull request #1431 from thecodingmachine/fixVideoHeight 
FIX: the video element should not have a bigger height than its container
 2021-09-10 16:54:47 +02:00
David Négrier
7cabf64b11 Adding more tests 2021-09-10 16:40:09 +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
b50253a529 Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-10 15:10:11 +02:00
Lurkars
d23820227e Merge branch 'twemojiEmoteMenu' of github.com:Lurkars/workadventure into twemojiEmoteMenuSvelte 2021-09-10 14:58:49 +02:00
Kharhamel
7471da6c26
Merge pull request #1434 from tabascoeye/patch-1 
explain new property jitsiWidth
 2021-09-10 14:09:28 +02:00
TabascoEye
9f310383ba
explain new property jitsiWidth 2021-09-09 22:58:30 +02:00
_Bastler
5497253e38 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 18:05:12 +02:00
David Négrier
5626e45f4a
Merge pull request #1430 from thecodingmachine/better_test_page 
Improving design of the test page
 2021-09-09 14:07:19 +02:00
_Bastler
e5aef085fa Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 12:38:11 +02:00
David Négrier
e715ca42c4 Improving design of the test page 2021-09-09 11:35:17 +02:00
grégoire parant
1e6433a65e
Merge pull request #1429 from thecodingmachine/develop 
Next release v1.5.0
 2021-09-09 11:27:05 +02:00
David Négrier
c07d853588
Merge pull request #1428 from thecodingmachine/more_test 
Adding a new test case to check video display from mobile
 2021-09-09 11:15:36 +02:00
David Négrier
24cd17ac51 Adding a new test case to check video display on mobile 2021-09-09 10:41:17 +02:00
David Négrier
7432f15e27
Merge pull request #1427 from Lurkars/fixFlattenGroupLayers 
Fix flatten group layers
 2021-09-09 10:20:05 +02:00
_Bastler
2fd8eb3c91 fix flatten layers 2021-09-09 08:56:26 +02:00
Lurkars
0530735547 .gitignore to upstream 2021-09-09 08:52:24 +02:00
Lurkars
8dd404801a .gitignore to upstream 2021-09-09 08:51:20 +02:00
Lurkars
30b22d87a6 .gitignore to upstream 2021-09-09 08:50:57 +02:00
Lurkars
36df585a5e fix wrong layer names after re-enter room 2021-09-09 08:47:38 +02:00
Lurkars
1db11a45e3 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-09-09 08:37:28 +02:00
_Bastler
52489f9c72 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-09 08:25:41 +02:00
Gregoire Parant
2a0d3759b1 Merge branch 'develop' 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-08 18:26:48 +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
David Négrier
65b9da926b
Adding the menu of the workadventu.re website in this repo (#1420) 
Because the workadventu.re website documentation regarding map building directly comes from that repo, it makes sense to export the menu in the repo.
This way, when we add a new documentation page, we can edit the menu in the same pull request.
 2021-09-08 14:28:29 +02:00
David Négrier
d7a5435d9e
Adding documentation for the new "openTab" property (#1419) 2021-09-08 14:27:40 +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
610ed9ae85 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-08 11:24:08 +02:00
David Négrier
149b417d8d
Merge pull request #1417 from thecodingmachine/doc_special_zones 
Migrating documentation to this repository
 2021-09-08 10:43:29 +02:00
David Négrier
699097c55b Migrating all the map-building documentation to Github. 
+ adding links to Youtube tutorials
 2021-09-08 10:28:39 +02:00
_Bastler
bfc476fedd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-08 10:03:13 +02:00
David Négrier
9ccd967cb8 Adding special zone documentation and Typescript documentation 
This commit splits the special zone documentation in 3 different pages (open website / meeting rooms / special zones).
It also migrates special zones doc and using-typescript doc to Github repository
 2021-09-08 08:46:01 +02:00
Kharhamel
0a44e3b4a1
Merge pull request #1415 from thecodingmachine/fixChromeTracks 
FIX: reimplemented the old stream behavior on bad navigators like chrome
 2021-09-07 17:06:18 +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
Lurkars
09125621d8 update gitignore 2021-09-06 19:16:05 +02:00
_Bastler
64613b076e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-06 18:49:47 +02:00
_Bastler
f320184d23 latest dev 2021-09-06 18:36:31 +02:00
Lurkars
b29f649822 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2021-09-06 18:23:40 +02:00
David Négrier
62682cb18c
Merge pull request #1414 from thecodingmachine/doc_variables 
Adding a dedicated doc for variables
 2021-09-06 16:12:17 +02:00
David Négrier
76362e81e8 Adding a dedicated doc for variables 2021-09-06 16:06:49 +02:00
Kharhamel
317fe28286
Merge pull request #1413 from thecodingmachine/frontpretty 
Frontpretty
 2021-09-06 14:35:50 +02:00
kharhamel
4160235b92 ran pretty on the front 2021-09-06 14:31:59 +02:00
kharhamel
7743bda3eb added yarn run pretty to the front ci 2021-09-06 14:27:01 +02:00