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

3789 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_Bastler
ed28cd0882 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-14 10:43:49 +01:00
David Négrier
391c34d0c9
Merge pull request #1729 from thecodingmachine/dependabot/npm_and_yarn/pusher/follow-redirects-1.14.7 
Bump follow-redirects from 1.14.4 to 1.14.7 in /pusher
 2022-01-14 10:43:18 +01:00
David Négrier
0abdf9faf8 Merge pull request #1728 from thecodingmachine/dependabot/npm_and_yarn/back/follow-redirects-1.14.7 
Bump follow-redirects from 1.14.6 to 1.14.7 in /back
 2022-01-14 10:43:08 +01:00
_Bastler
15db3e3704 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-14 10:36:39 +01:00
dependabot[bot]
201d804d98
Bump follow-redirects from 1.14.4 to 1.14.7 in /pusher 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-14 09:27:12 +00:00
dependabot[bot]
57b2b4e9fe
Bump follow-redirects from 1.14.6 to 1.14.7 in /back 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.6 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.6...v1.14.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-14 09:27:10 +00:00
David Négrier
f39f13b2dd
Merge pull request #1727 from thecodingmachine/dependabot/npm_and_yarn/front/follow-redirects-1.14.7 
Bump follow-redirects from 1.14.4 to 1.14.7 in /front
 2022-01-14 10:26:39 +01:00
dependabot[bot]
8c11db1f62
Bump follow-redirects from 1.14.4 to 1.14.7 in /front 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.4 to 1.14.7.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.4...v1.14.7)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-14 07:50:10 +00:00
_Bastler
2f16ec51e4 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-13 16:56:39 +01:00
David Négrier
57d2dec756
Merge pull request #1724 from thecodingmachine/master 
Backport fix 2022-01-13
 2022-01-13 15:59:54 +01:00
_Bastler
22bfe8bc71 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-13 13:30:09 +01:00
David Négrier
7b08429db3
Merge pull request #1719 from thecodingmachine/focusable-zone-allow-zoom 
Focusable zone allow zoom
 2022-01-12 18:51:17 +01:00
David Négrier
242411889a
Merge pull request #1722 from thecodingmachine/allow_disabling_modules 
Adding a new property to prevent script from being loaded in "modules" mode
 2022-01-12 18:49:00 +01:00
David Négrier
9425fd70c0 Adding a new property to prevent script from being loaded in "modules" mode 
Scripts in module mode need to be abide by the Same Origin Policy (CORS headers are used to load them)
This can cause issues on some setups.

This commit adds a new "scriptDisableModuleSupport" that can be used to disable the "modules" mode.

Closes #1721
 2022-01-12 17:36:31 +01:00
Hanusiak Piotr
905bd079ec camera is now properly focusing on target when zooming, if any 2022-01-12 12:58:27 +01:00
Hanusiak Piotr
58af1f05f7 unlocking zooming with a delay when entering / leaving focusable zone 2022-01-12 12:08:11 +01:00
_Bastler
04a334c8e7 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-12 10:56:50 +01:00
_Bastler
f9f2370afb fix firefox private 2022-01-12 10:56:47 +01:00
Alexis Faizeau
3f3f488924
Merge pull request #1718 from thecodingmachine/master 
Hot fixes
 2022-01-12 10:47:27 +01:00
grégoire parant
55da4d5f20
Merge pull request #1717 from thecodingmachine/HotFixHtaccess 
HotFix htaccess to accespt "*"
 2022-01-12 08:39:55 +01:00
Gregoire Parant
2f4e518f17 HotFix Htaccess to accespt "*" 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-01-12 08:20:54 +01:00
_Bastler
fa4cd34c49 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-11 08:42:54 +01:00
David Négrier
376af7d28d
Merge pull request #1714 from jonnytest1/hash-reset 
always set hash
 2022-01-10 17:39:13 +01:00
_Bastler
7a12e48e70 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-10 15:42:59 +01:00
jonny
786448a2b2 prettier fix 2022-01-09 23:21:07 +01:00
jonny
73ab4f3a26 prettier fix 2022-01-09 23:18:38 +01:00
jonny
e5afac1df5 prettier fix 2022-01-09 23:17:17 +01:00
David Négrier
e298a35efb
Merge pull request #1712 from albanbruder/fix-dump-serialization 
Fix circular serialization in pusher dump endpoint
 2022-01-09 22:39:38 +01:00
jonny
954d39bb0c always set hash 2022-01-09 13:51:44 +01:00
Alban Bruder
4a78e449df Fix circular serialization in pusher dump endpoint 2022-01-07 14:37:44 +01:00
_Bastler
5cc573ac49 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2022-01-07 09:59:00 +01:00
David Négrier
adac0df05d
Merge pull request #1710 from thecodingmachine/fix_startup 
Fix pusher and back locked
 2022-01-06 19:29:21 +01:00
David Négrier
996adc6b59 Fix pusher and back locked 
Due to the "messages" container changing .ts files at the very same time Typescript is compiling, ts-node-dev can end up in a "locked" state.
This is a bug in ts-node-dev.

To avoid issues, I am adding a small 5 seconds delay in pusher and back startup. This should allow (at least on my hardware) enough time for messages to be generated.
 2022-01-06 18:53:45 +01:00
David Négrier
201332bfc8
Merge pull request #1709 from thecodingmachine/fix_close_webites 
Fixing closing of all websites.
 2022-01-06 18:25:13 +01:00
David Négrier
0fb09cc431 Fixing closing of all websites. 2022-01-06 12:27:00 +01:00
David Négrier
787cc508b8
Merge pull request #1708 from thecodingmachine/fix_firefox_private_browsing 
Fixing WA crashing in Firefox private mode
 2022-01-06 11:57:12 +01:00
David Négrier
d713c82568 Fixing WA crashing in Firefox private mode 
Due to the way we now handle the browser cache, previously ignored errors in the Cache API were now explicitly thrown, preventing the loading of Firefox in private mode.
This commit fixes the issue and improves the stacktrace display of errors at the same time.
 2022-01-06 11:55:43 +01:00
David Négrier
4257604229
Merge pull request #1707 from thecodingmachine/no_thow_literals 
Stopping sending literal errors
 2022-01-06 11:46:50 +01:00
David Négrier
ab0f5e9837 Stopping sending literal errors 
Errors now must be of "Error" type.
Rule added in eslint.
 2022-01-06 10:52:06 +01:00
David Négrier
88509916a8
Merge pull request #1702 from thecodingmachine/develop 
Deploy 2022-01-04
 2022-01-05 22:35:44 +01:00
David Négrier
c46882e099
Merge pull request #1672 from thecodingmachine/2daysLimit 
2 days limit
 2022-01-05 17:42:01 +01:00
David Négrier
d24e074fbf
Merge pull request #1703 from thecodingmachine/2daysLimit_stupid_front 
2 days limit improvements
 2022-01-05 16:36:57 +01:00
David Négrier
f82012d315 Flagging Room.isPublic property as deprecated 2022-01-05 16:30:41 +01:00
David Négrier
6766ee86da Merge branch '2daysLimit' of github.com:thecodingmachine/workadventure into 2daysLimit 2022-01-05 14:32:17 +01:00
David Négrier
968e71cbca Removing completely any analysis of the URL from the front. 
Instead, data related to room is sent from the admin, via the pusher.
 2022-01-05 14:32:02 +01:00
Gregoire Parant
229bf2480c Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/RoomConnection.ts
 2022-01-05 12:14:59 +01:00
Gregoire Parant
08847e1a64 Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/src/Connexion/RoomConnection.ts
 2022-01-05 12:08:27 +01:00
Gregoire Parant
ae122261d4 Fix prettier update 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-01-05 11:49:01 +01:00
Gregoire Parant
8b758a0053 Merge branch 'develop' into 2daysLimit 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-01-05 11:47:31 +01:00
David Négrier
c85679b42c Merge branch 'develop' of github.com:thecodingmachine/workadventure into 2daysLimit 2022-01-05 10:19:23 +01:00