_Bastler
ee6443670a
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-11-30 17:31:08 +01:00
David Négrier
d81ecb3199
Making the ADMIN_URL parameter optionnal in front
...
This parameter is only used in the SAAS version (and ideally, should disappear completely).
The warning message that uses the ADMIN_URL should originate from the admin itself.
2021-11-30 14:58:37 +01:00
David Négrier
06483fd586
Fixing "Query string parameters prevent WA from loading"
...
Due to a regression, query string parameters added to the URL (like:
http://play.workadventure.localhost/_/global/maps.workadventure.localhost/starter/map.json?utm_source=sendinblue&utm_campaign=WA+-+2021+Christmap+map+launch&utm_medium=email#foo
) were causing a crash in WA.
This commit fixes the issue (and adds a E2E test)
2021-11-30 14:34:43 +01:00
Alexis Faizeau
812485f863
Cannot rezise main cowebsite when fullscreen is enable
2021-11-29 18:35:32 +01:00
_Bastler
c43348f9f0
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-11-25 11:45:23 +01:00
Alexis Faizeau
a775a01d2a
Resize cowebsites when main slot is loaded
2021-11-25 10:48:14 +01:00
_Bastler
3c1c82fbd9
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-11-25 07:37:55 +01:00
grégoire parant
5bdb5d98a9
Merge pull request #1589 from thecodingmachine/fix-grab-cowebsite
...
Handle touch & mouse events on same time for cowebsite holder
2021-11-24 19:44:07 +01:00
Gregoire Parant
060c844468
Fix htag in localstorage
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-24 19:24:43 +01:00
Alexis Faizeau
07c01d81bf
Handle touch & mouse events on same time for cowebsite holder
2021-11-24 18:38:39 +01:00
_Bastler
96e9540e97
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-11-24 17:10:50 +01:00
David Négrier
94959e2e91
Merge branch 'develop' of github.com:thecodingmachine/workadventure into HotFixCleanTokenParamUrl
...
# Conflicts:
# back/src/Services/Logger.ts
2021-11-24 17:03:29 +01:00
David Négrier
257162c451
Fixing prettier
2021-11-24 17:02:11 +01:00
_Bastler
e796503810
latest dev
2021-11-24 16:29:14 +01:00
David Négrier
6e6cdc7bde
Revert "Improving log messages"
2021-11-24 16:20:07 +01:00
David Négrier
6c5f330b71
Merge pull request #1584 from thecodingmachine/fixes
...
Fixes
2021-11-24 15:55:33 +01:00
Gregoire Parant
b02c09fc7b
Clean token auth of url params
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-24 15:49:45 +01:00
_Bastler
a99be4fbf5
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-11-24 15:44:37 +01:00
Alexis Faizeau
5c3036e18b
Display a default skin on remote player entity
2021-11-24 15:43:01 +01:00
David Négrier
a1107bd20e
Merge branch 'develop' of github.com:thecodingmachine/workadventure into improve_logging
2021-11-24 15:36:35 +01:00
_Bastler
04a7d20d54
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-11-24 15:32:05 +01:00
David Négrier
07ba532c5e
Prettier fixes on front
2021-11-24 15:31:17 +01:00
David Négrier
9b29fde1b3
Merge branch 'develop' of github.com:thecodingmachine/workadventure into pretty_ci_front_fix
2021-11-24 15:30:29 +01:00
David Négrier
dc58f16418
Merge pull request #1582 from thecodingmachine/end-to-end-tests
...
Making the loader resizable
2021-11-24 15:30:15 +01:00
David Négrier
2cbf5b56af
Fixing linting
2021-11-24 15:29:12 +01:00
David Négrier
7c6105d93a
Making the loader resizable
...
This way, if the window is resized while loading, the loading bar will stay in the middle
2021-11-24 15:21:07 +01:00
Alexis Faizeau
24640d13bb
Fix removing of co-website action trigger
2021-11-24 14:50:19 +01:00
_Bastler
16a73d4de6
getMapProperty
2021-11-24 14:32:45 +01:00
_Bastler
bc7d9a96fe
fix keepCircle Property
2021-11-24 13:06:43 +01:00
_Bastler
3b98888c3a
merge latest dev
2021-11-24 13:00:27 +01:00
David Négrier
2f632ae472
Merge pull request #1580 from thecodingmachine/fix-tab
...
Fix tab index on embedded iframes
2021-11-24 12:17:25 +01:00
Alexis Faizeau
6a7385947d
Fix authentication mandatory
2021-11-24 11:55:28 +01:00
_Bastler
1873ac1836
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-11-24 11:18:29 +01:00
Alexis Faizeau
4ca763c028
Fix tab index on embbed iframes
2021-11-24 11:05:18 +01:00
David Négrier
550ffaf8a8
Merge branch 'develop' of github.com:thecodingmachine/workadventure into end-to-end-tests
...
# Conflicts:
# front/src/Administration/AnalyticsClient.ts
2021-11-24 11:01:50 +01:00
David Négrier
806b97afab
Refactoring Analytics to remove errors
2021-11-24 10:21:19 +01:00
David Négrier
a82f4e1813
Adding end-to-end tests
...
The first test is testing a tricky cache scenario with the back when testing variables.
The end-to-end package used is testcafe.
2021-11-23 15:43:34 +01:00
Gregoire Parant
ecc6321e17
Add new action post hog
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-18 11:39:56 +01:00
_Bastler
347156a3ea
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-11-17 19:34:31 +01:00
Alexis Faizeau
44c99fb0ef
Fix zoom from cowebsite changes
2021-11-17 15:26:58 +01:00
_Bastler
a6891b704c
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-11-17 09:28:11 +01:00
Gregoire Parant
e5979998c5
Update design of credit page
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 15:28:54 +01:00
Gregoire Parant
0614fa7b47
HotFix copy link to share it
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 15:03:54 +01:00
Gregoire Parant
e54732be1b
HotFix authentication manager to get data from back
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 14:46:32 +01:00
Gregoire Parant
ba89d9b122
HotFix DISABLED_ROOM for env variable
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 13:18:40 +01:00
Gregoire Parant
8768374460
HotFix connexion manager
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 13:14:40 +01:00
Gregoire Parant
ec1cc92c8b
replace console log by error
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 11:23:18 +01:00
Gregoire Parant
c1dc438138
HotFix encrypted and decrypted error
...
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
2021-11-16 11:14:27 +01:00
_Bastler
13dafdf14b
update Dockerfile
2021-11-16 11:06:20 +01:00
_Bastler
e43e1d8463
Merge branch 'develop' of github.com:thecodingmachine/workadventure
2021-11-16 10:56:33 +01:00