Commit Graph

4380 Commits

Author SHA1 Message Date
Lukas Hass
72c35e2d06
remove unused LIVE_RELOAD variable 2022-02-15 20:28:52 +01:00
Lukas Hass
620e218612
remove iframe.html 2022-02-15 20:19:45 +01:00
David Négrier
88bfd537cd
Merge pull request #1880 from thecodingmachine/fix-cowebsite-high-master
Hot fixes for co-websites
2022-02-15 18:19:36 +01:00
David Négrier
8af7166c47
Merge pull request #1879 from lukashass/fix-comparison-always-false
fix comparison that is always false
2022-02-15 18:17:40 +01:00
Alexis Faizeau
06dd2202f6 Fix hidden main cowebsite swape 2022-02-15 17:28:15 +01:00
Alexis Faizeau
a52ad233d8 Fix cowebsite swap 2022-02-15 17:28:02 +01:00
Alexis Faizeau
0f16d909e7 The second opened cowebsite must be displayed on highlighted 2022-02-15 17:27:32 +01:00
Lukas Hass
cdc3d182bc
fix comparison that is always false 2022-02-15 12:00:32 +01:00
Lukas Hass
8c96a986fb
remove webpack reference 2022-02-15 11:07:04 +01:00
_Bastler
f2c90c5adc Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-15 09:27:21 +01:00
David Négrier
e801e2a435
Merge pull request #1876 from thecodingmachine/fix_pusher_header
pusher: add missing Content-Type header for json responses (2)
2022-02-15 09:25:31 +01:00
David Négrier
4bcdbcb1bd Fixing linting 2022-02-15 09:15:41 +01:00
_Bastler
9cfe75f4d1 Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-15 08:14:24 +01:00
_Bastler
d63a32e94e Co-Wesbite 2022-02-15 08:13:53 +01:00
Lukas Hass
779f5c1fdb
Merge branch 'develop' into vite 2022-02-14 22:11:53 +01:00
Lukas Hass
ae8c18fa4b
prevent reading property 'collides' of undefined
fixes e2e tests
2022-02-14 22:07:15 +01:00
David Négrier
897fbc1e8d
Merge pull request #1875 from thecodingmachine/dependabot/npm_and_yarn/tests/follow-redirects-1.14.8
Bump follow-redirects from 1.14.7 to 1.14.8 in /tests
2022-02-14 22:04:53 +01:00
David Négrier
c2129b3d05
Merge pull request #1860 from thecodingmachine/dependabot/npm_and_yarn/pusher/follow-redirects-1.14.8
Bump follow-redirects from 1.14.7 to 1.14.8 in /pusher
2022-02-14 22:04:43 +01:00
David Négrier
ceb5682f81
Merge pull request #1859 from thecodingmachine/dependabot/npm_and_yarn/back/follow-redirects-1.14.8
Bump follow-redirects from 1.14.7 to 1.14.8 in /back
2022-02-14 22:04:34 +01:00
David Négrier
8c8fdb9ee0
Merge pull request #1858 from thecodingmachine/dependabot/npm_and_yarn/front/follow-redirects-1.14.8
Bump follow-redirects from 1.14.7 to 1.14.8 in /front
2022-02-14 22:04:22 +01:00
Lukas Hass
ae46a1faf1
Merge branch 'develop' into vite 2022-02-14 19:47:27 +01:00
dependabot[bot]
73e20c3a24
Bump follow-redirects from 1.14.7 to 1.14.8 in /tests
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-14 17:46:49 +00:00
David Négrier
7a44f3dcb8
Merge pull request #1853 from anbraten/remove-external-deps
Bundle nes.css and quill-js
2022-02-14 18:46:19 +01:00
David Négrier
03b63174d4
Merge pull request #1873 from thecodingmachine/develop
Deploy 2022-02-14
2022-02-14 17:10:22 +01:00
David Négrier
9b15ce546e
Merge pull request #1864 from thecodingmachine/translate_visiting_card
Adding a missing translation for "Visiting card"
2022-02-14 16:46:25 +01:00
Hanusiak Piotr
6f41622263 unignoring resources directory 2022-02-14 16:26:50 +01:00
David Négrier
9bfce8412a Adding a missing translation for "Visiting card"
Also, changing "Visiting Card" to "Business Card" in English
2022-02-14 16:00:53 +01:00
_Bastler
5451fc788d Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-14 12:57:46 +01:00
David Négrier
0b095eb85c
Merge pull request #1855 from Lurkars/i18n-de-DE
update de-DE translations.
2022-02-14 11:38:26 +01:00
Hanusiak Piotr
639c456540 use png instead of svg for talk icon 2022-02-14 10:37:13 +01:00
David Négrier
d0af766394 Adding missing reference to Camera doc 2022-02-14 09:07:37 +01:00
Ludwig Behm
9073024b1d
pusher: add missing Content-Type header for json responses 2022-02-14 00:53:38 +01:00
dependabot[bot]
2cb7c518c1
Bump follow-redirects from 1.14.7 to 1.14.8 in /pusher
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-13 21:56:46 +00:00
dependabot[bot]
f9e8e0bd60
Bump follow-redirects from 1.14.7 to 1.14.8 in /back
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-13 20:09:24 +00:00
Anton Bracke
aef64afdb9
fix quill import 2022-02-13 20:20:38 +01:00
Lukas Hass
29cdb1a8e5
Merge branch 'develop' into vite 2022-02-13 11:46:26 +01:00
dependabot[bot]
c6b125b347
Bump follow-redirects from 1.14.7 to 1.14.8 in /front
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

---
updated-dependencies:
- dependency-name: follow-redirects
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-13 09:55:59 +00:00
Lurkars
7da4fd7da6 merge latest translations 2022-02-12 14:37:25 +01:00
_Bastler
fe2ed33d5f Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-12 13:36:30 +01:00
David Négrier
c4d18716c3
Merge pull request #1854 from thecodingmachine/develop
Deploy 2022-02-11
2022-02-11 19:02:47 +01:00
David Négrier
e85f94998f Merge branch 'develop' of github.com:thecodingmachine/workadventure into feature-voice-chat-indicator 2022-02-11 18:40:03 +01:00
David Négrier
55c2c2e555
Merge pull request #1843 from thecodingmachine/move-to-improvements
Move to improvements
2022-02-11 18:28:50 +01:00
David Négrier
0b82df0d41 Merge branch 'develop' of github.com:thecodingmachine/workadventure into move-to-improvements 2022-02-11 16:58:40 +01:00
Anton Bracke
948a674bb2
use correct file 2022-02-11 16:17:17 +01:00
David Négrier
80bfeb823e
Merge pull request #1852 from thecodingmachine/stabilize-cowebsite
Stabilize cowebsite
2022-02-11 16:05:19 +01:00
Anton Bracke
51f7ce10e1
remove extenal quill import 2022-02-11 15:53:52 +01:00
David Négrier
62f8a131a9 Adding translation for "Walk automatically to my position" 2022-02-11 15:52:24 +01:00
David Négrier
a91f022fd2 Making typesafe-i18n watch by default 2022-02-11 15:47:57 +01:00
Anton Bracke
3dbd83ac47
load nes.css from npm 2022-02-11 15:47:17 +01:00
David Négrier
664cce87b8 Improving rendering of share screen 2022-02-11 15:37:23 +01:00