_Bastler
|
3c1c82fbd9
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure
|
2021-11-25 07:37:55 +01:00 |
|
David Négrier
|
3d29fcad7e
|
Merge pull request #1591 from thecodingmachine/develop
Next release 1.5.7
|
2021-11-24 22:57:20 +01:00 |
|
David Négrier
|
ecb72d0fd1
|
Adding FRONT_URL in pusher
|
2021-11-24 22:47:46 +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 |
|
grégoire parant
|
a59c07d8a3
|
Merge pull request #1590 from thecodingmachine/FixHashLocalStorage
Fix htag last map URL visited in localstorage
|
2021-11-24 19:43:48 +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 |
|
David Négrier
|
69a26a0e55
|
Merge pull request #1588 from thecodingmachine/develop
Deploy 2021-11-24 2
|
2021-11-24 17:44:48 +01:00 |
|
David Négrier
|
445599416c
|
Commenting waiting as this does not work for some reason
|
2021-11-24 17:24:11 +01:00 |
|
_Bastler
|
96e9540e97
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure
|
2021-11-24 17:10:50 +01:00 |
|
David Négrier
|
e8a78a0646
|
Merge pull request #1585 from thecodingmachine/HotFixCleanTokenParamUrl
Clean token auth of url params
|
2021-11-24 17:10:22 +01:00 |
|
_Bastler
|
a63c351eae
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure
|
2021-11-24 17:03:42 +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 |
|
David Négrier
|
cf6d461247
|
Merge pull request #1586 from thecodingmachine/revert-1552-improve_logging
Revert "Improving log messages"
|
2021-11-24 17:00:37 +01:00 |
|
David Négrier
|
d1122d75ec
|
Fixing CI
|
2021-11-24 16:59:22 +01:00 |
|
David Négrier
|
d8c10ce10a
|
CI fix
|
2021-11-24 16:32:37 +01:00 |
|
_Bastler
|
e796503810
|
latest dev
|
2021-11-24 16:29:14 +01:00 |
|
David Négrier
|
065404758b
|
Making sure pusher and admin are started in CI
|
2021-11-24 16:22:26 +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 |
|
David Négrier
|
be3c1eea6f
|
Merge pull request #1583 from thecodingmachine/pretty_ci_front_fix
Fixing running of prettier check on the front
|
2021-11-24 15:46:18 +01:00 |
|
_Bastler
|
a99be4fbf5
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure
|
2021-11-24 15:44:37 +01:00 |
|
David Négrier
|
0fe2de090e
|
Merge pull request #1552 from thecodingmachine/improve_logging
Improving log messages
|
2021-11-24 15:43:24 +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 |
|
_Bastler
|
4458011871
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure
|
2021-11-24 15:25:12 +01:00 |
|
David Négrier
|
d3bd99b5ee
|
Fixing running of prettier check on the front
|
2021-11-24 15:24:24 +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 |
|
David Négrier
|
ced08e69c9
|
Merge pull request #1581 from thecodingmachine/develop
Deploy 2021-12-24
|
2021-11-24 13:36:11 +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
|
bb435f3580
|
Merge pull request #1556 from thecodingmachine/iconserver
Add icon server on self host services
|
2021-11-24 12:24:57 +01:00 |
|
David Négrier
|
64e86411c5
|
Fixing env var for ICON_URL
|
2021-11-24 12:19:45 +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 |
|
David Négrier
|
f3e498439c
|
Merge pull request #1579 from thecodingmachine/end-to-end-tests
Adding End to end tests
|
2021-11-24 12:09:23 +01:00 |
|
David Négrier
|
dfad0a7b57
|
Removing useless wait
|
2021-11-24 12:03:48 +01:00 |
|
Alexis Faizeau
|
6a7385947d
|
Fix authentication mandatory
|
2021-11-24 11:55:28 +01:00 |
|
David Négrier
|
7c2bf8700b
|
Fixing test
|
2021-11-24 11:50:23 +01:00 |
|
David Négrier
|
780d92782c
|
Adding a wait step for messages generated file to be available before starting pusher and back
|
2021-11-24 11:31:11 +01:00 |
|
_Bastler
|
1873ac1836
|
Merge branch 'develop' of github.com:thecodingmachine/workadventure
|
2021-11-24 11:18:29 +01:00 |
|
David Négrier
|
168156b7ff
|
Display error logs in failure
|
2021-11-24 11:11:38 +01:00 |
|