lbehm/workadventure
1
0
Fork 0
Code Issues Pull requests Releases Activity
990 commits 21 branches 1 tag 50 MiB
Commit graph

990 commits

This branch
This branch
All branches
Author SHA1 Message Date
Gregoire Parant 64d00bda56 Add function to show when message received 2020-11-17 16:46:46 +01:00
Gregoire Parant b0bd4c5f40 Merge remote-tracking branch 'github.com/develop' into feature-discussion 2020-11-16 15:43:28 +01:00
David Négrier c7031c7c54
Merge pull request #411 from thecodingmachine/fix-#314 
Fix init position and trigger layers properties
 2020-11-16 15:24:21 +01:00
Gregoire Parant 2d0fc1072f Fix feedback 2020-11-16 15:05:51 +01:00
Kharhamel 74ec363449
Merge pull request #413 from thecodingmachine/nbRoomsGauge 
FEAT: added a prometheus gauge for the number of active rooms
 2020-11-12 14:56:01 +01:00
kharhamel b064f01f97 FEAT: added a prometheus gauge for the number of active rooms 2020-11-12 14:51:19 +01:00
Kharhamel 6c6d046891
Merge pull request #401 from kidager/qwerty-support 
Add support for QWERTY keyboards
 2020-11-12 10:32:58 +01:00
Kharhamel b468f03603
Merge pull request #412 from thecodingmachine/fix/iHatePong 
FIX: remove the ping and pong overrides server side
 2020-11-12 10:28:02 +01:00
kharhamel 9b64a970b5 FIX: remove the ping and pong overrides server side in favor of and idleTimeout and added a manual ping client side 2020-11-10 18:26:46 +01:00
Gregoire Parant 73fa0ecbfc Fix init position and trigger layers properties 2020-11-10 17:00:23 +01:00
David Négrier ed527f5e72
Merge pull request #409 from thecodingmachine/fix/cowebsiteConflicts 
Fix/cowebsite conflicts
 2020-11-10 15:54:27 +01:00
kharhamel 5a1147866c FIX: in dev mode, sockets won't be closed to prevent conflicts with live-reloading 2020-11-10 15:24:02 +01:00
kharhamel 1080328afa FIX: cowebsite transitions are now queued to prevent conflicts 2020-11-10 15:22:30 +01:00
Gregoire Parant b75f28d3ca Merge branch 'develop' into feature-discussion 
# Conflicts:
#	front/src/WebRtc/MediaManager.ts
 2020-11-10 15:15:24 +01:00
David Négrier 0a52d924fa
Merge pull request #408 from thecodingmachine/fix-#386 
Fix error get media stream camera
 2020-11-10 14:44:47 +01:00
Gregoire Parant 142566dfde Fix error get media stream camera 
Fix error camera when user have not cam on computer
 2020-11-10 14:03:29 +01:00
Gregoire Parant 0acbe20bbf Fix name send in message 2020-11-10 13:00:14 +01:00
Gregoire Parant 3333b3cee3 Fix feedback moufmouf 2020-11-10 12:38:32 +01:00
Gregoire Parant f837f1a31f Merge branch 'develop' into feature-discussion 2020-11-10 11:50:41 +01:00
Kharhamel 21d2e6aa69
Merge pull request #400 from thecodingmachine/fix/disconnect 
FIX: the server now closes the socket after 30s of no pong
 2020-11-09 15:38:44 +01:00
Jacem Chaieb c4f28a0a8d
Add support for QWERTY keyboards 2020-11-09 12:24:45 +01:00
kharhamel 85f2dabe6c FIX: the server now closes the socket after 30s of no pong 2020-11-09 12:12:52 +01:00
David Négrier a14e227706
Merge pull request #399 from thecodingmachine/fix/cowebsite 
FIX: close the coWebSite on network error
 2020-11-09 11:27:52 +01:00
kharhamel 760708948f FIX: close the coWebSite on network error 2020-11-09 11:16:54 +01:00
David Négrier b817d5e126
Merge pull request #398 from thecodingmachine/master 
Backporting website changes
 2020-11-06 17:35:08 +01:00
David Négrier b2a6b3c242
Merge pull request #396 from thecodingmachine/website-typos-changes 
Website typos changes
 2020-11-06 17:34:20 +01:00
David Négrier 71e2c92f7b
Update website/dist/create-map.html 2020-11-06 16:46:28 +01:00
David Négrier d0f643cfa6
Update website/dist/choose-map.html 2020-11-06 16:46:22 +01:00
kevin 467cf3260f change 'play private' to 'work in privtae', fix broken html, add homepage link in inner pages 2020-11-06 06:57:56 +01:00
kevin 8e1e2596e5 changing typos on Home Page 2020-11-05 23:17:58 +01:00
David Négrier 8960efca71 Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-discussion 2020-11-05 16:47:41 +01:00
David Négrier 2258d8323b
Merge pull request #395 from thecodingmachine/fixwithoutadmin 
Fixing deployment of WA without admin
 2020-11-05 16:47:12 +01:00
David Négrier 8af99a4286 Upgrading cypress action version 2020-11-05 16:35:10 +01:00
David Négrier 2509f391c2 Fixing admin url deploy 2020-11-05 16:23:01 +01:00
David Négrier e54061d464 Deploying admin only on master / develop branch or if branch starts with "admin" 2020-11-05 11:58:33 +01:00
David Négrier fcef89aa70 Fixing deployment of WA without admin 
The open-source version must be installable without an admin backend. While working on AFUP's meeting, we introduced regression preventing WA from working without an admin. This commit fixes this behaviour and makes WA installable again!
 2020-11-05 11:47:33 +01:00
David Négrier 53cfd24e3f Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-discussion 2020-11-05 09:09:22 +01:00
Gregoire Parant 6ef2148a34 Fix feedback @moufmouf 2020-11-04 13:07:38 +01:00
David Négrier 681cecf7a3
Merge pull request #391 from thecodingmachine/develop 
Release 2020/11/04 (2)
 2020-11-04 12:32:32 +01:00
David Négrier 3fc7886b42 Fixing rlespinasse master branch deleted 2020-11-04 12:15:01 +01:00
David Négrier 4606f23d8f
Merge pull request #390 from thecodingmachine/develop 
Release 2020/11/04
 2020-11-04 11:42:34 +01:00
Gregoire Parant a2dd3bd6ab Fix style 2020-10-30 20:35:45 +01:00
Gregoire Parant 724bb7f288 Merge branch 'develop' into feature-discussion 2020-10-30 20:04:12 +01:00
Kharhamel 8a687f40cb
Merge pull request #383 from thecodingmachine/improvedMetrics 
improvment: added a prometheus gauge for the number of groups in a room
 2020-10-30 18:27:51 +01:00
kharhamel b1d2543631 improvment: added prometheus metrics for the number of groups in a room 2020-10-30 15:23:50 +01:00
David Négrier 6658e2d666
Merge pull request #381 from thecodingmachine/dependabot/npm_and_yarn/back/systeminformation-4.27.11 
Bump systeminformation from 4.27.5 to 4.27.11 in /back
 2020-10-28 10:18:10 +01:00
dependabot[bot] d472f984b5
Bump systeminformation from 4.27.5 to 4.27.11 in /back 
Bumps [systeminformation](https://github.com/sebhildebrandt/systeminformation) from 4.27.5 to 4.27.11.
- [Release notes](https://github.com/sebhildebrandt/systeminformation/releases)
- [Changelog](https://github.com/sebhildebrandt/systeminformation/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sebhildebrandt/systeminformation/commits)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-10-27 20:55:36 +00:00
Gregoire Parant 80355e6b85 fix layout mode click when discussion is activated 2020-10-27 20:46:53 +01:00
Gregoire Parant 55c1bcee66 Add callback report in discussion part 2020-10-27 20:18:25 +01:00
David Négrier 8941b362d1
Merge pull request #379 from rlespinasse/patch-1 
ci: update to github-slug-action v1.1.1
 2020-10-27 18:10:50 +01:00