_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,753 Commits 2 Branches 0 Tags 47 MiB
47e5e360df
Commit Graph

4753 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Hanusiak Piotr
e590cee753 forcing close talkIcon indicator when leaving bubble conversation 2022-02-16 15:55:07 +01:00
Hanusiak Piotr
0b0d3b5beb fixed issue with chat indicator persisting after being out of conversation 2022-02-16 14:56:59 +01:00
David Négrier
933d1c0d87
Merge pull request #1851 from thecodingmachine/avoid-exits-on-path 
calculate cost for exit tiles
 2022-02-16 14:46:37 +01:00
David Négrier
f4e3410ce1
Merge pull request #1884 from Lithimlin/patch-2 
prod template: Use docker-hub images by default
 2022-02-16 14:46:15 +01:00
David Négrier
b720bd6ba2
Merge pull request #1885 from Lithimlin/patch-3 
prod template: fix typo in pusher host rule
 2022-02-16 14:45:23 +01:00
David Négrier
9ca7703c2d
Merge pull request #1882 from Lithimlin/patch-1 
Change default front URL to "play"
 2022-02-16 14:43:52 +01:00
Hanusiak Piotr
dea5784c9b Merge branch 'develop' into feature-voice-chat-indicator 2022-02-16 14:37:01 +01:00
Hanusiak Piotr
3c54e38401 unlock diagonal movement 2022-02-16 14:28:35 +01:00
Hanusiak Piotr
3875d3b0f5 Merge branch 'develop' into avoid-exits-on-path 2022-02-16 14:03:48 +01:00
JL Euler
fafb0462ad
prod template: fix typo in pusher host rule 
A typo in the pusher's SSL host rule prevented it from being connected correctly.
 2022-02-16 12:27:17 +01:00
JL Euler
74534772ac
prod template: Use docker-hub images by default 
In production environments, it is more likely for people to use the stable versions from the docker hub.
The build parameters were thus removed and the image variables uncommented.
 2022-02-16 11:46:58 +01:00
JL Euler
0d58abe690
Change default front URL to "play" 
Previously, the URL was "front". However, this is not in line with the default URL of the dev environments, where it is "play.workadventure.localhost".
 2022-02-16 10:53:50 +01:00
_Bastler
dca2cc3c6c Merge branch 'develop' of github.com:thecodingmachine/workadventure into develop 2022-02-16 09:16:54 +01:00
_Bastler
c878dab09b oidc improvments 2022-02-16 09:16:40 +01:00
Lurkars
2816946c94 add OIDC username + locale 2022-02-16 09:11:08 +01:00
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