Commit Graph

21 Commits

Author SHA1 Message Date
_Bastler 92af014e0f Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-22 08:37:18 +01:00
David Négrier 375f78ca30 Adding missing powered by images 2022-03-18 18:11:32 +01:00
Gregoire Parant a16f2c7534 Refactor how to use new Jitsi icon
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-03-18 18:11:32 +01:00
David Négrier 6890e2579c Removing old unused images
Just a bit of cleanup!
2022-03-18 17:58:41 +01:00
Alexis Faizeau c51fe1cfed Translate camera help (#1983)
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
2022-03-18 11:50:48 +01:00
_Bastler 9c4e4f08f8 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-03-15 14:14:11 +01:00
David Négrier 3988559d2a Removing old unused images
Just a bit of cleanup!
2022-03-15 13:51:10 +01:00
David Négrier 352f144e97 Merge pull request #1963 from thecodingmachine/develop
Deploy 2022-03-14
2022-03-14 13:01:10 +01:00
_Bastler 0e1dff6a11 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop_vite 2022-02-26 11:11:51 +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
Gregoire Parant 07d399403b Refactor how to use new Jitsi icon
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-23 00:27:07 +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
Gregoire Parant 3541f153fa Push Jitsi icon
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2022-02-22 23:37:28 +01:00
Lukas Hass 2755489ccf Merge branch 'develop' into vite 2022-02-17 15:20:58 +01:00
Lukas Hass 620e218612 remove iframe.html 2022-02-15 20:19:45 +01:00
Lukas Hass 29cdb1a8e5 Merge branch 'develop' into vite 2022-02-13 11:46:26 +01:00
Lukas Hass f87704b2ef remove redundant font loading
see https://github.com/typekit/webfontloader/blob/fd70d89061c07f019d3c1dfdf1368b0c0962fedf/README.md#custom
2022-02-01 01:29:38 +01:00
Lukas Hass b83fc77183 use vite plugin for env-config generation 2022-01-31 16:56:50 +01:00
Lukas Hass 585a398b14 move index.html to . 2022-01-31 16:18:51 +01:00
Lukas Hass 590e16ff8a move all static assets to public/ 2022-01-31 16:14:34 +01:00