Commit Graph

3989 Commits

Author SHA1 Message Date
Anton Bracke 4535a8ae96 Merge remote-tracking branch 'upstream/develop' into electron 2022-03-03 14:43:33 +01:00
Valdo Romao 1181187271 Fixed discord links 2022-02-28 21:07:36 +01:00
grégoire parant 9173a30f04 Merge pull request #1934 from thecodingmachine/oidcProfile
add OIDC username + locale
2022-02-28 15:18:47 +01:00
Lurkars c8047bf4fa change to scope variable in enviroment 2022-02-28 14:56:44 +01:00
Lurkars 0a2bfc556f Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile 2022-02-28 10:35:15 +01:00
Lurkars c3b3d5e9d6 Fix nginx.conf to work with OIDC (#1932)
* fix nginx.conf to work with OIDC
* rewrite like .htaccess
2022-02-28 09:07:38 +01:00
Lukas f1cba60825 base front production image on official nginx image 2022-02-25 20:32:10 +01:00
Lukas 3f3af9b957 improve docker build caching
install dependencies before copying source into image
2022-02-25 18:53:14 +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
Anton Bracke af15490dd1 focus appView after opening 2022-02-24 12:11:48 +01:00
Benedicte Quimbert b5c8214c22 Documents the meetingRoomLabel property 2022-02-23 18:27:16 +01:00
Anton Bracke da6b5b9f60 fix leave server selected after opening once 2022-02-23 11:49:42 +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
Anton Bracke 44a9e2aeb0 fix config loading 2022-02-22 20:24:09 +01:00
Anton Bracke 445bcaf130 fix linting 2022-02-22 20:07:36 +01:00
Anton Bracke ce3d829041 fix type 2022-02-22 20:02:13 +01:00
Anton Bracke 92ec433539 fix resizing 2022-02-22 19:58:51 +01:00
Anton Bracke 67ef2abb24 fix default settings and window resizing 2022-02-22 19:51:52 +01:00
Anton Bracke 454ee6cf4c nits, fixes 2022-02-22 19:01:26 +01:00
Anton Bracke e82de63b34 remove unused lib 2022-02-22 18:41:08 +01:00
Anton Bracke 07d3ea961e fix types and lint 2022-02-22 18:15:36 +01:00
Anton Bracke 6b97cbfc17 nits, fixes 2022-02-22 18:10:36 +01:00
Anton Bracke 732acb25df fix selected server 2022-02-22 17:56:57 +01:00
Anton Bracke 4e243151dd add desktop api to front 2022-02-22 16:57:56 +01:00
Anton Bracke 1425513452 fix type 2022-02-22 14:09:36 +01:00
Anton Bracke 3f21befdc6 save auto-launch option, disable shortcuts in settings 2022-02-22 14:00:17 +01:00
Anton Bracke 71c8e32b2f improve types 2022-02-22 12:02:56 +01:00
Anton Bracke d03544c839 fix linter error 2022-02-22 10:49:35 +01:00
Anton Bracke 3779c4b7db add missing sub-path 2022-02-22 10:44:21 +01:00
Anton Bracke 41be011d5e move electron folder 2022-02-22 10:41:55 +01:00
Anton Bracke ac18aab773 improve local-app 2022-02-22 10:05:21 +01:00
Anton Bracke 6b208ceb0c Merge remote-tracking branch 'origin/develop' into electron 2022-02-21 22:12:49 +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
Anton Bracke 6844e0d39d improve style 2022-02-20 21:51:55 +01:00
Anton Bracke 0f910693ef add ci 2022-02-20 21:09:15 +01:00
Anton Bracke 4337264157 cleanup 2022-02-20 21:06:27 +01:00
Anton Bracke 05d7f64d1d fix ci 2022-02-20 20:44:55 +01:00
Anton Bracke d526db5bf3 add svelte local-app 2022-02-20 20:30:53 +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