server

Kraut.World/server

Fork 0

Commit graph

0a52d924fa

Merge pull request #408 from thecodingmachine/fix-#386 David Négrier 2020-11-10 14:44:47 +01:00
142566dfde Fix error get media stream camera Gregoire Parant 2020-11-10 14:03:29 +01:00
694f5d692f Merge branch 'develop' into windows-focus-blur-camera Gregoire Parant 2020-11-10 13:07:08 +01:00
76014e3dc1 Merge branch 'develop' into action-button Gregoire Parant 2020-11-10 13:06:47 +01:00
0acbe20bbf Fix name send in message Gregoire Parant 2020-11-10 13:00:14 +01:00
3333b3cee3 Fix feedback moufmouf Gregoire Parant 2020-11-10 12:38:32 +01:00
f837f1a31f Merge branch 'develop' into feature-discussion Gregoire Parant 2020-11-10 11:50:41 +01:00
21d2e6aa69

Merge pull request #400 from thecodingmachine/fix/disconnect Kharhamel 2020-11-09 15:38:44 +01:00
c4f28a0a8d

Add support for QWERTY keyboards Jacem Chaieb 2020-11-09 12:24:45 +01:00
85f2dabe6c FIX: the server now closes the socket after 30s of no pong kharhamel 2020-11-09 12:12:52 +01:00
a14e227706

Merge pull request #399 from thecodingmachine/fix/cowebsite David Négrier 2020-11-09 11:27:52 +01:00
760708948f FIX: close the coWebSite on network error kharhamel 2020-11-09 11:16:54 +01:00
91f1410424

Merge 7bb534c398 into b817d5e126 grégoire parant 2020-11-07 02:09:01 +01:00
00b83ae349 Merge branch 'develop' of github.com:thecodingmachine/workadventure into windows-focus-blur-camera David Négrier 2020-11-06 17:36:43 +01:00
b817d5e126

Merge pull request #398 from thecodingmachine/master David Négrier 2020-11-06 17:35:08 +01:00
b2a6b3c242

Merge pull request #396 from thecodingmachine/website-typos-changes David Négrier 2020-11-06 17:34:20 +01:00
71e2c92f7b

Update website/dist/create-map.html David Négrier 2020-11-06 16:46:28 +01:00
d0f643cfa6

Update website/dist/choose-map.html David Négrier 2020-11-06 16:46:22 +01:00
467cf3260f change 'play private' to 'work in privtae', fix broken html, add homepage link in inner pages kevin 2020-11-06 06:57:56 +01:00
8e1e2596e5 changing typos on Home Page kevin 2020-11-05 23:17:58 +01:00
8dfdee85ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into action-button David Négrier 2020-11-05 16:47:56 +01:00
8960efca71 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-discussion David Négrier 2020-11-05 16:47:41 +01:00
2258d8323b

Merge pull request #395 from thecodingmachine/fixwithoutadmin David Négrier 2020-11-05 16:47:12 +01:00
8af99a4286 Upgrading cypress action version David Négrier 2020-11-05 16:35:10 +01:00
2509f391c2 Fixing admin url deploy David Négrier 2020-11-05 15:08:03 +01:00
e54061d464 Deploying admin only on master / develop branch or if branch starts with "admin" David Négrier 2020-11-05 11:58:33 +01:00
fcef89aa70 Fixing deployment of WA without admin David Négrier 2020-11-05 11:25:35 +01:00
040170d6ab Merge branch 'develop' of github.com:thecodingmachine/workadventure into action-button David Négrier 2020-11-05 09:14:12 +01:00
53cfd24e3f Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-discussion David Négrier 2020-11-05 09:09:22 +01:00
6f10a48d39

Typo fix David Négrier 2020-11-04 16:37:15 +01:00
a1d3b01619 Fix typo Gregoire Parant 2020-11-04 16:30:01 +01:00
3339dc532a Fix user_interface Gregoire Parant 2020-11-04 13:48:07 +01:00
d924e03966 Merge branch 'develop' into user_interface Gregoire Parant 2020-11-04 13:39:59 +01:00
968787555f Update feedback @moufmouf Gregoire Parant 2020-11-04 13:33:58 +01:00
6ef2148a34 Fix feedback @moufmouf Gregoire Parant 2020-11-04 13:07:38 +01:00
47a049ecaf Feedback comment @moufmouf Gregoire Parant 2020-11-04 12:42:33 +01:00
1f7f94ea9c Feedback review MR Gregoire Parant 2020-11-04 12:39:28 +01:00
681cecf7a3

Merge pull request #391 from thecodingmachine/develop David Négrier 2020-11-04 12:32:32 +01:00
3fc7886b42 Fixing rlespinasse master branch deleted David Négrier 2020-11-04 12:15:01 +01:00
4606f23d8f

Merge pull request #390 from thecodingmachine/develop David Négrier 2020-11-04 11:42:34 +01:00
00ce899a74 Merge branch 'develop' into usersLimit Gregoire Parant 2020-11-01 12:00:31 +01:00
6051e5f46a Fix when user have activated action button Gregoire Parant 2020-11-01 11:53:24 +01:00
fcb7f364b6 Fix button action when user have activated Gregoire Parant 2020-11-01 11:49:09 +01:00
74de2746c2 Create action button Gregoire Parant 2020-10-31 14:04:55 +01:00
a2dd3bd6ab Fix style Gregoire Parant 2020-10-30 20:35:45 +01:00
724bb7f288 Merge branch 'develop' into feature-discussion Gregoire Parant 2020-10-30 20:04:12 +01:00
8a687f40cb

Merge pull request #383 from thecodingmachine/improvedMetrics Kharhamel 2020-10-30 18:27:51 +01:00
b1d2543631 improvment: added prometheus metrics for the number of groups in a room kharhamel 2020-10-30 15:23:50 +01:00
6658e2d666

Merge pull request #381 from thecodingmachine/dependabot/npm_and_yarn/back/systeminformation-4.27.11 David Négrier 2020-10-28 10:18:10 +01:00
d472f984b5

Bump systeminformation from 4.27.5 to 4.27.11 in /back dependabot[bot] 2020-10-27 20:55:36 +00:00
df49ea856a Fix conflict error Gregoire Parant 2020-10-27 20:51:11 +01:00
80355e6b85 fix layout mode click when discussion is activated Gregoire Parant 2020-10-27 20:46:53 +01:00
55c1bcee66 Add callback report in discussion part Gregoire Parant 2020-10-27 20:18:25 +01:00
8941b362d1

Merge pull request #379 from rlespinasse/patch-1 David Négrier 2020-10-27 18:10:50 +01:00
dfd2b2048c

Merge pull request #380 from thecodingmachine/jitsiQOL Kharhamel 2020-10-27 17:57:56 +01:00
67aa2f4b6c opening and closing jitsi windows now trigger some transitions kharhamel 2020-10-27 16:59:12 +01:00
7bb534c398 Update ellipse to use canvas update-arc-canvas Gregoire Parant 2020-10-27 00:42:38 +01:00
20ba628ed8 Merge branch 'develop' into update-arc-canvas Gregoire Parant 2020-10-26 22:45:05 +01:00
855f42a12e Merge remote-tracking branch 'github.com/develop' into windows-focus-blur-camera Gregoire Parant 2020-10-26 22:43:14 +01:00
997acd17ad Update to use update function scene Gregoire Parant 2020-10-26 22:39:52 +01:00
11127db9f3

ci: update to github-slug-action v1.1.1 Romain Lespinasse 2020-10-26 20:10:59 +01:00
11541f9f55

Merge pull request #378 from thecodingmachine/jitsiQOL Kharhamel 2020-10-26 17:05:39 +01:00
65a710d1f4 disabling audio/video in jitsi carry over to wa kharhamel 2020-10-26 15:07:34 +01:00
f95f38b092 Permit to remove callback Gregoire Parant 2020-10-26 14:13:51 +01:00
850be63284 Fix style Gregoire Parant 2020-10-26 00:26:10 +01:00
1e096af43b Fix font family Gregoire Parant 2020-10-26 00:03:30 +01:00
bdb504722f Fix style -webkit-focus Gregoire Parant 2020-10-25 22:41:31 +01:00
1945c24704 Create send data discussion Gregoire Parant 2020-10-25 21:59:14 +01:00
f344adc48b Create discussion Gregoire Parant 2020-10-25 19:39:15 +01:00
b6fe9e72e1 Fix style and refactor Gregoire Parant 2020-10-25 19:38:00 +01:00
de424769f3

Merge pull request #375 from thecodingmachine/update-admin-navbar David Négrier 2020-10-25 19:15:11 +01:00
69f3e511ab Ping status camera and microphone Gregoire Parant 2020-10-24 14:40:51 +02:00
199ed1266a Switch off camera when user is not focused on WorkAdventure windows Gregoire Parant 2020-10-24 14:13:23 +02:00
e640f67156 update admin navbar Gregoire Parant 2020-10-24 13:37:33 +02:00
146245f193 Fix start position Gregoire Parant 2020-10-24 12:17:51 +02:00
22e36dc20e Change for ellipse Gregoire Parant 2020-10-24 12:15:29 +02:00
1cf2f19e47 Merge branch 'develop' into usersLimit Gregoire Parant 2020-10-24 10:50:37 +02:00
3e41875cd5

Merge pull request #373 from thecodingmachine/jitsiQOL Kharhamel 2020-10-23 17:45:54 +02:00
00ad28f084 feat: jitsi no start with audio or video muted when needed kharhamel 2020-10-23 17:00:56 +02:00
3fdca94afb refactor: move jitsi creation to a dedicated and cleaned some type in mediaManager kharhamel 2020-10-23 16:16:30 +02:00
7c9cdfe014

Merge pull request #363 from thecodingmachine/develop David Négrier 2020-10-22 18:30:29 +02:00
8d0b78072e

Merge pull request #362 from thecodingmachine/movenospeak David Négrier 2020-10-22 16:38:26 +02:00
b7854dfb90 When a user moves, do not trigger group creation David Négrier 2020-10-22 16:15:30 +02:00
c8434dfd4c Renaming test file David Négrier 2020-10-22 16:14:32 +02:00
a68c661221 Fix CI uniq-socket-by-uuid Gregoire Parant 2020-10-22 11:28:34 +02:00
367afa511b Close previous client socket if uuid client socket already exist Gregoire Parant 2020-10-22 11:26:01 +02:00
bd4b6e468e Fix conflict Gregoire Parant 2020-10-22 02:03:58 +02:00
7df605e771 remove useless Gregoire Parant 2020-10-22 01:58:53 +02:00
4f8b315727 Merge branch 'develop' into usersLimit Gregoire Parant 2020-10-22 01:56:57 +02:00
fd1904c246 delete canjoin function Gregoire Parant 2020-10-22 01:55:38 +02:00
f002170ed5

Merge pull request #355 from thecodingmachine/user-limit-grp grégoire parant 2020-10-22 01:47:53 +02:00
ff9f5cfc32 Revert "Create and send close message" Gregoire Parant 2020-10-22 01:46:41 +02:00
f9bb749c56 Redirect user on wait scene Gregoire Parant 2020-10-22 01:33:36 +02:00
cb1c59c1f3

Merge pull request #360 from thecodingmachine/develop David Négrier 2020-10-22 00:04:21 +02:00
b7d883b2e7

Merge pull request #359 from thecodingmachine/simple-limit-user David Négrier 2020-10-22 00:03:35 +02:00
3a565362a2 Simple limit connexion in room Gregoire Parant 2020-10-21 23:45:08 +02:00
13a74126a2

Merge pull request #358 from thecodingmachine/develop David Négrier 2020-10-21 23:39:10 +02:00
cad94c7982

Merge pull request #357 from thecodingmachine/fix-red-circle David Négrier 2020-10-21 23:12:42 +02:00
cfb6ad581e Fix red circle created Gregoire Parant 2020-10-21 23:08:05 +02:00
bf135c0f23

Merge pull request #356 from thecodingmachine/develop David Négrier 2020-10-21 19:54:25 +02:00