Commit Graph

4291 Commits

Author SHA1 Message Date
_Bastler
7e9196a8a0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-25 14:16:19 +01:00
David Négrier
3a9ce7615d
Merge pull request #1914 from thecodingmachine/dependabot/npm_and_yarn/front/ansi-regex-5.0.1
Bump ansi-regex from 5.0.0 to 5.0.1 in /front
2022-02-25 14:10:21 +01:00
grégoire parant
433f3ddd97
Merge pull request #1927 from thecodingmachine/calendar-meetings-doc
Documents the meetingRoomLabel property
2022-02-24 20:01:48 +01:00
grégoire parant
9da3c9c169
Merge pull request #1921 from thecodingmachine/fix-hash-parameter-from-standby
clear hashParams after moving player with moveTo param
2022-02-24 20:01:26 +01:00
Benedicte Quimbert
b5c8214c22 Documents the meetingRoomLabel property 2022-02-23 18:27:16 +01:00
_Bastler
ac4f16ad03 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-23 17:07:14 +01:00
_Bastler
021a2511e0 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-23 16:59:15 +01:00
Hanusiak Piotr
9fe4782fbd clear hashParams after moving player with moveTo param 2022-02-23 10:14:09 +01:00
Gregoire Parant
658781e02e Merge branch 'master' into develop
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/public/resources/logos/meet.svg
2022-02-22 23:40:48 +01:00
grégoire parant
437f35817a
Merge pull request #1918 from thecodingmachine/HotFixJitsiIcon
Hot fix jitsi icon
2022-02-22 23:38:25 +01:00
Gregoire Parant
3541f153fa Push Jitsi icon
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-22 23:37:28 +01:00
grégoire parant
0275bf912c
Merge pull request #1907 from thecodingmachine/HotFixAddCoWebsiteInformation
Update CoWebsite Jitsi
2022-02-22 23:30:38 +01:00
dependabot[bot]
3aef82303c
Bump ansi-regex from 5.0.0 to 5.0.1 in /front
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-21 16:27:29 +00:00
David Négrier
dfb2fca417
Merge pull request #1802 from lukashass/vite
Use vite for frontend development
2022-02-21 17:26:35 +01:00
Gregoire Parant
0943ec8991 Define color text by brightness
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-21 01:09:53 +01:00
Gregoire Parant
070ad6b993 Add jiti logo for Jitsi button meeting 2022-02-20 23:38:20 +01:00
Gregoire Parant
23f7d6f08f Update CoWebsite Jitsi
- Change Jitsi meeting icon
 - Add Jitsi meeting information

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-20 23:28:27 +01:00
_Bastler
90a69b0704 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-20 13:55:11 +01:00
_Bastler
f7167537c3 fix dockerfile 2022-02-20 13:28:10 +01:00
Lukas Hass
3ee9b26650
use optional chaining 2022-02-19 20:25:17 +01:00
Lukas Hass
e8d5335bc0
Merge branch 'develop' into vite 2022-02-19 20:08:50 +01:00
David Négrier
f9ac8e0c18
Merge pull request #1903 from lukashass/improve-e2e
add playwright and run e2e tests on production-like environment
2022-02-19 18:57:59 +01:00
David Négrier
679a5d5504
Merge pull request #1898 from thecodingmachine/dependabot/npm_and_yarn/front/url-parse-1.5.7
Bump url-parse from 1.5.3 to 1.5.7 in /front
2022-02-19 18:17:24 +01:00
Lukas Hass
cc24fd48d5
update generic-type-guard and @geprog/vite-plugin-env-config
allows to get rid of node built-in polyfills
2022-02-19 00:13:25 +01:00
grégoire parant
1f7302be95
Merge pull request #1904 from thecodingmachine/HotFixToEnableFreemiumLimitation
Enable limitation freemium
2022-02-18 22:19:44 +01:00
Gregoire Parant
e4f9f89a40 Fix pretty
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-18 21:57:11 +01:00
Gregoire Parant
26f5416b63 Fix svelt check
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-18 21:44:17 +01:00
Gregoire Parant
3a734cc2ae Enable limitation freemium
- Fix warning message
 - Fix post message API pusher

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-18 21:33:23 +01:00
Lukas Hass
4eca2cbfaa
load ADMIN_API_TOKEN with dotenv-cli 2022-02-18 16:37:50 +01:00
Lukas Hass
ed0e49d16e
update docs and remove references to testcafe 2022-02-18 16:11:26 +01:00
Lukas Hass
3d86204db6
add page type 2022-02-18 15:43:06 +01:00
Lukas Hass
cf6204f0db
increase log retrieval timeout 2022-02-18 15:41:02 +01:00
Lukas Hass
6db6dd7e4d
fix artifact upload 2022-02-18 15:19:05 +01:00
Lukas Hass
b1c7e01008
add playwright and run e2e tests on production like environment 2022-02-18 14:40:20 +01:00
_Bastler
136269170d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-18 09:56:05 +01:00
dependabot[bot]
707b78b506
Bump url-parse from 1.5.3 to 1.5.7 in /front
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-17 14:52:03 +00:00
David Négrier
8dc31c9e06
Merge pull request #1897 from thecodingmachine/cd_to_admin
Continuous Deployment: add connect to admin
2022-02-17 15:51:19 +01:00
David Négrier
5b05589d32
Merge pull request #1893 from thecodingmachine/fix-path-finding-diagonals
disable corner cutting
2022-02-17 15:34:40 +01:00
David Négrier
ea8f791fae Adding missing ADMIN_SOCKETS_TOKEN environment variable in case we deploy with the connection to the admin 2022-02-17 15:34:00 +01:00
Lukas Hass
2755489ccf
Merge branch 'develop' into vite 2022-02-17 15:20:58 +01:00
David Négrier
e36a1f1ced Continuous Deployment: add connect to admin
We can now connect to a remote admin server in the CD environment by using the new "deploy-connect-to-admin" label in the PR.
2022-02-17 15:04:51 +01:00
Lukas Hass
c163107875
import browserified version of simple-peer 2022-02-17 15:02:48 +01:00
Hanusiak Piotr
ecd4b5907a disable corner cutting 2022-02-17 12:44:57 +01:00
Alexis Faizeau
7820c6b964
Merge pull request #1889 from thecodingmachine/fix-co
Fix importing coWesbite from API to store
2022-02-17 09:52:50 +01:00
Alexis Faizeau
f186111d2f Fix importing coWesbite from API to store 2022-02-17 09:51:32 +01:00
grégoire parant
8c3c3c9d43
Merge pull request #1888 from thecodingmachine/hotFixFunnelLimitedMpa
HitFix Update css warning message & add message button
2022-02-16 20:26:07 +01:00
_Bastler
b1728b7b8c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 20:25:12 +01:00
Gregoire Parant
f0c7e4ea8a Update css warning message & add message button
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-16 20:15:16 +01:00
David Négrier
eae6c2c5e3
Merge pull request #1887 from thecodingmachine/master
Backporting cowebsites hot-fixes
2022-02-16 18:03:23 +01:00
David Négrier
a7264954ea
Merge pull request #1820 from thecodingmachine/feature-voice-chat-indicator
Feature voice chat indicator
2022-02-16 16:46:13 +01:00