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

1018 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Kharhamel
dfd2b2048c
Merge pull request #380 from thecodingmachine/jitsiQOL 
opening and closing jitsi windows now trigger some transitions
 2020-10-27 17:57:56 +01:00
kharhamel
67aa2f4b6c opening and closing jitsi windows now trigger some transitions 2020-10-27 17:44:57 +01:00
Romain Lespinasse
11127db9f3
ci: update to github-slug-action v1.1.1 2020-10-26 20:10:59 +01:00
Kharhamel
11541f9f55
Merge pull request #378 from thecodingmachine/jitsiQOL 
disabling audio/video in jitsi carry over to wa
 2020-10-26 17:05:39 +01:00
kharhamel
65a710d1f4 disabling audio/video in jitsi carry over to wa 2020-10-26 16:55:56 +01:00
Gregoire Parant
f95f38b092 Permit to remove callback 2020-10-26 14:13:51 +01:00
Gregoire Parant
850be63284 Fix style 2020-10-26 00:26:10 +01:00
Gregoire Parant
1e096af43b Fix font family 2020-10-26 00:03:30 +01:00
Gregoire Parant
bdb504722f Fix style -webkit-focus 2020-10-25 22:41:31 +01:00
Gregoire Parant
1945c24704 Create send data discussion 2020-10-25 21:59:14 +01:00
Gregoire Parant
f344adc48b Create discussion 
- Add new discussion class
- Feature to discuss and report user
 2020-10-25 19:39:15 +01:00
Gregoire Parant
b6fe9e72e1 Fix style and refactor 2020-10-25 19:38:00 +01:00
David Négrier
de424769f3
Merge pull request #375 from thecodingmachine/update-admin-navbar 
update admin navbar
 2020-10-25 19:15:11 +01:00
Gregoire Parant
e640f67156 update admin navbar 2020-10-24 13:37:33 +02:00
Kharhamel
3e41875cd5
Merge pull request #373 from thecodingmachine/jitsiQOL 
some refractoring to jitsicreation and mediaManager
 2020-10-23 17:45:54 +02:00
kharhamel
00ad28f084 feat: jitsi no start with audio or video muted when needed 2020-10-23 17:19:20 +02:00
kharhamel
3fdca94afb refactor: move jitsi creation to a dedicated and cleaned some type in mediaManager 2020-10-23 17:19:14 +02:00
David Négrier
7c9cdfe014
Merge pull request #363 from thecodingmachine/develop 
Release 2020-10-22 2
 2020-10-22 18:30:29 +02:00
David Négrier
8d0b78072e
Merge pull request #362 from thecodingmachine/movenospeak 
When a user moves, do not trigger group creation
 2020-10-22 16:38:26 +02:00
David Négrier
b7854dfb90 When a user moves, do not trigger group creation 
In order to avoid triggering group creation when walking next to someone we should avoid creating a group unless the user stops next to the other members of the group.
 2020-10-22 16:15:30 +02:00
David Négrier
c8434dfd4c Renaming test file 2020-10-22 16:14:32 +02:00
David Négrier
cb1c59c1f3
Merge pull request #360 from thecodingmachine/develop 
Deploy 2020-10-22
 2020-10-22 00:04:21 +02:00