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
00b83ae349
Merge branch 'develop' of github.com:thecodingmachine/workadventure into windows-focus-blur-camera
2020-11-06 17:36:43 +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
8dfdee85ea
Merge branch 'develop' of github.com:thecodingmachine/workadventure into action-button
2020-11-05 16:47:56 +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
040170d6ab
Merge branch 'develop' of github.com:thecodingmachine/workadventure into action-button
2020-11-05 09:14:12 +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
a1d3b01619
Fix typo
2020-11-04 16:30:01 +01:00
Gregoire Parant
968787555f
Update feedback @moufmouf
2020-11-04 13:33:58 +01:00
Gregoire Parant
6ef2148a34
Fix feedback @moufmouf
2020-11-04 13:07:38 +01:00
Gregoire Parant
47a049ecaf
Feedback comment @moufmouf
2020-11-04 12:42:33 +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
6051e5f46a
Fix when user have activated action button
2020-11-01 11:53:24 +01:00
Gregoire Parant
fcb7f364b6
Fix button action when user have activated
2020-11-01 11:49:09 +01:00
Gregoire Parant
74de2746c2
Create action button
2020-10-31 14:04:55 +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
df49ea856a
Fix conflict error
2020-10-27 20:51:11 +01: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
Gregoire Parant
855f42a12e
Merge remote-tracking branch 'github.com/develop' into windows-focus-blur-camera
...
# Conflicts:
# front/src/WebRtc/MediaManager.ts
2020-10-26 22:43:14 +01:00
Gregoire Parant
997acd17ad
Update to use update function scene
2020-10-26 22:39:52 +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
