_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,468 Commits 2 Branches 0 Tags 47 MiB
124ffdca30
Commit Graph

3468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_Bastler
124ffdca30 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-09 12:27:14 +01:00
David Négrier
1b982588e4
Merge pull request #1641 from thecodingmachine/doc_contrib_scripting 
Developer documentation regarding scripting API
 2021-12-09 12:17:18 +01:00
David Négrier
bef81edb84
Merge pull request #1639 from tabascoeye/develop 
adding map properties to documentation
 2021-12-09 12:17:02 +01:00
David Négrier
d7d77dd7d6 Developer documentation regarding scripting API 
This PR adds a first developer documentation regarding how to extend the scripting API.
 2021-12-09 12:13:16 +01:00
_Bastler
4695098632 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-09 08:14:10 +01:00
TabascoEye
0cb17c7fd1
adding map properties to documentation 
* screenshot of the result of the map properties
* first try at documenting map properties
 2021-12-08 16:41:22 +01:00
David Négrier
15bdb0eb56
Merge pull request #1636 from thecodingmachine/no_retry_on_token_decrypted_error 
Don't retry Axios if a token decryption failed
 2021-12-08 15:32:43 +01:00
David Négrier
598c7412a2 When sending an invalid token, the HTTP API from the Pusher now returns a 401 instead of an HTTP 500. 2021-12-08 14:46:23 +01:00
David Négrier
ff77a18262 Don't retry Axios if a token decryption failed 
If a token decryption failed, it will emit a HTTP 500.

We should not retry Axios in this case but rather fail.

Note: a token decryption failed should not throw a HTTP 500 but another error code (HTTP 401?)
So maybe this fix is plainly wrong.
 2021-12-08 11:16:39 +01:00
_Bastler
72ac099bc2 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-07 20:42:02 +01:00
David Négrier
1e6ce4dec8 Merge branch 'master' of github.com:thecodingmachine/workadventure into develop 2021-12-07 14:59:17 +01:00
David Négrier
7b94f8b8ca
Merge pull request #1612 from thecodingmachine/fix-admin-sockets 
Creating only one WS connection to pusher from admin
 2021-12-07 14:56:13 +01:00
_Bastler
3e1fefef1e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-07 10:48:24 +01:00
David Négrier
2f8bd52dba
Merge pull request #1628 from workadventure-xce/feat/force-cowebsite-triggers 
New setting: Always ask before opening cowebsites / Jitsi meetings
 2021-12-07 10:42:33 +01:00
_Bastler
576f027f9e Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-07 09:25:12 +01:00
David Négrier
d68da0754e
Merge pull request #1472 from thecodingmachine/type_module 
Switching API to use type="module" scripts
 2021-12-07 09:23:58 +01:00
David Négrier
df700a8740
Merge pull request #1494 from workadventure-xce/fix/volumeSliderUI 
Fix volume slider UI updates
 2021-12-07 09:20:55 +01:00
_Bastler
517a78b686 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-07 09:15:47 +01:00
David Négrier
2495aa1faf
Merge pull request #1615 from thecodingmachine/dependabot/npm_and_yarn/front/joeattardi/emoji-button-4.6.2 
Bump @joeattardi/emoji-button from 4.6.0 to 4.6.2 in /front
 2021-12-07 09:14:10 +01:00
_Bastler
ccbddf1d74 latest dev 2021-12-07 08:38:35 +01:00
_Bastler
13e854c4c4 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-12-07 08:38:21 +01:00
PizZaKatZe
d49d44d7ea New setting: Always ask before opening cowebsites / Jitsi meetings 2021-12-06 23:25:25 +01:00
PizZaKatZe
a71fc40b5d Fix volume slider UI updates 2021-12-06 21:54:33 +01:00
David Négrier
6a8717c22f
Merge pull request #1602 from thecodingmachine/e2e_reconnect_tests 
Adding a reconnect feature in case first Pusher request fails
 2021-12-06 18:44:18 +01:00
Alexis Faizeau
a6a3a76491
Merge pull request #1625 from thecodingmachine/linting 
Fix Svelte linting
 2021-12-06 18:35:16 +01:00
David Négrier
b9840cfa3d Fix CI 2021-12-06 18:34:09 +01:00
David Négrier
84f7a8c383 Pretty fix 2021-12-06 18:20:06 +01:00
Alexis Faizeau
3bb86dfea8 Fix Svelte linting 2021-12-06 18:16:24 +01:00
David Négrier
c27662c315 Merge branch 'develop' of github.com:thecodingmachine/workadventure into e2e_reconnect_tests 2021-12-06 18:07:47 +01:00
David Négrier
d7875c2c68 Adding missing handler for error message in front + removing 2 useless classes in ServerToClientMessage 2021-12-06 18:00:17 +01:00
Alexis Faizeau
2859093648
Merge pull request #1624 from thecodingmachine/linting 
Add lint on Svelte files
 2021-12-06 16:47:26 +01:00
David Négrier
331daca854 Fixing admin token for requests 2021-12-06 16:37:27 +01:00
Alexis Faizeau
c95e20c677 Lint & Prettier fixes on Svelte files 2021-12-06 16:36:05 +01:00
Alexis Faizeau
6cd76b9c1b Add Eslint check & Prettier on Svelte files 2021-12-06 16:10:35 +01:00
David Négrier
f6803b6d5d Fixing pusher and back url 2021-12-06 15:38:30 +01:00
David Négrier
15565c9a29 Changing pusher / back URL depending on environment 2021-12-06 15:29:24 +01:00
David Négrier
44c4b4fc34 Fixing error handling of fonts when there is no connection to front 2021-12-06 15:14:38 +01:00
David Négrier
a991f0eec9 increase timeouts (who knows....) 2021-12-06 12:04:04 +01:00
David Négrier
f5f69e7143 Fixing missing await 2021-12-06 11:35:37 +01:00
David Négrier
94762c86c5 Refactoring tests 2021-12-06 11:21:18 +01:00
David Négrier
05f805445a Adding a delay.... who knows! 2021-12-05 21:33:40 +01:00
David Négrier
a5325e9327 Improving test speed and trying to get error logs whatever happens 2021-12-05 21:24:29 +01:00
David Négrier
a5c7abe61e Enable testcafe dev mode to pinpoint testcafe errors 2021-12-05 21:21:15 +01:00
David Négrier
97460886f0 Fixing CI 2021-12-05 19:24:54 +01:00
David Négrier
a864498d16 Fixing docker-compose up linking to wrong directory when started in container 2021-12-04 23:17:07 +01:00
David Négrier
492fd2ed4e Adding retried URL in retry error logs 2021-12-04 18:30:12 +01:00
David Négrier
2cfc504e9a Adding a retry on /anonymLogin 2021-12-04 18:18:43 +01:00
David Négrier
da1687bdf2 Forcing network name to be able to use docker-compose from inside testcafe container 
(otherwise, containers started inside testcafe container are not on the same network)
 2021-12-04 17:23:09 +01:00
David Négrier
720370a9fa Revert "Trying restart instead in up --force-recreate to have pusher running again" 
This reverts commit 3028a1b0e4.
 2021-12-04 10:53:40 +01:00
David Négrier
3028a1b0e4
Trying restart instead in up --force-recreate to have pusher running again 2021-12-04 00:52:17 +01:00