David Négrier
a7d2c600ff
Merge branch 'master' of github.com:thecodingmachine/workadventure into develop
2021-06-30 13:35:29 +02:00
David Négrier
50fcc1caaa
Fixing signature of openCoWebSite
2021-06-30 10:40:53 +02:00
David Négrier
164f88ef4c
Merge pull request #1250 from thecodingmachine/fix_push_to_npm
...
Fixing NPM package generation
2021-06-30 10:21:04 +02:00
David Négrier
bfcdd31ed2
Fixing NPM package generation
...
The generation was broken due to the refactoring in several classes (some of them where not properly exported).
Also, trying to generate the NPM package on every build now (to detect issues).
2021-06-30 10:15:55 +02:00
David Négrier
cb2485bab0
Merge pull request #1248 from thecodingmachine/master_backport
...
Backporting master into develop
2021-06-29 18:50:54 +02:00
David Négrier
8f3d9277ac
Merging master into develop
2021-06-29 18:39:43 +02:00
David Négrier
33ee190b0f
Merge pull request #1246 from thecodingmachine/OpenWebSiteScriptAllowAPI
...
Cowebsite opened by script can use Iframe Api
2021-06-29 18:27:54 +02:00
David Négrier
3c77ce945d
Improving docs
2021-06-29 18:26:21 +02:00
David Négrier
c5949a0337
Fixing linting
2021-06-29 17:57:19 +02:00
David Négrier
ef0d422a49
Fixing building of typings
2021-06-29 17:55:19 +02:00
David Négrier
285712bfc7
Fixing building of typings
2021-06-29 17:31:01 +02:00
David Négrier
1cd18db560
Fixing broken NPM typings package build
2021-06-29 16:59:54 +02:00
GRL
95bd639124
More statement
2021-06-29 16:50:33 +02:00
David Négrier
3afc725af6
Merge pull request #1245 from thecodingmachine/cowebsiteAllowApibyScript
...
Allow a website opened by script to use iframe_api
2021-06-29 16:10:22 +02:00
GRL
6462773e7f
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-29 14:16:19 +02:00
GRL
b457ce493b
Suppress console.log
2021-06-29 09:44:57 +02:00
GRL
dad8cdef8b
Merge branch 'develop' of github.com:thecodingmachine/workadventure into OpenWebSiteScriptAllowAPI
2021-06-29 09:42:20 +02:00
GRL
65d1e4e768
Add CHANGELOG and a map for test
2021-06-29 09:40:15 +02:00
David Négrier
ec75509725
Merge pull request #839 from ValdoTR/new-favicon
...
Updated favicons
2021-06-29 09:03:15 +02:00
Valdo Romao
723001e1e7
Added better favicon
2021-06-29 00:12:00 +01:00
GRL
389ca25b6a
Cowebsite opened by script can use Iframe Api
2021-06-28 18:00:48 +02:00
Valdo Romao
4cf5a6f7a0
Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into new-favicon
2021-06-28 15:56:28 +01:00
GRL
5c3a207c72
Merge branch 'cowebsiteAllowApibyScript' of github.com:thecodingmachine/workadventure into cowebsiteAllowApibyScript
2021-06-28 16:13:53 +02:00
GRL
06920a2271
Use dynamic Iframe API
2021-06-28 16:13:38 +02:00
GRL78
9ab73c0aa0
Update docs/maps/api-reference.md
...
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
2021-06-28 16:05:29 +02:00
GRL
feab5da2ad
Allow a website opened by script to use iframe_api
2021-06-28 15:55:30 +02:00
David Négrier
49d627ca38
Merge pull request #1244 from thecodingmachine/warning_message_on_iframe_api
...
Adding a warning message if an unauthorized iFrame tries to communicate with WA
2021-06-28 15:24:55 +02:00
David Négrier
3fd4f9d384
Adding a warning message if an unauthorized iFrame tries to communicate with WA
...
Closes #1241
2021-06-28 15:20:27 +02:00
David Négrier
1e57028e6e
Renaming changeTile to setTiles
2021-06-28 14:58:49 +02:00
David Négrier
319db95bc8
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
...
# Conflicts:
# front/src/Api/iframe/room.ts
2021-06-28 14:50:26 +02:00
David Négrier
0c5774a48f
Merge pull request #1229 from jonnytest1/cache-fix
...
immutableData was never assigned
2021-06-28 14:18:45 +02:00
David Négrier
71a5e29ae4
Making script URL dynamic
...
Signed-off-by: David Négrier <d.negrier@thecodingmachine.com>
2021-06-28 14:13:49 +02:00
David Négrier
86cb118378
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-28 14:12:10 +02:00
David Négrier
46ae4fda74
Merge pull request #1242 from thecodingmachine/iframe_load_url
...
Trying to find iframe_api.js URL script dynamically
2021-06-28 14:10:32 +02:00
David Négrier
303d2a7837
Adding a warning regarding the "controlled" XSS in iframe.html
2021-06-28 13:55:17 +02:00
David Négrier
7f79c2dc4a
Making the test page URL dynamic depending on the environment
2021-06-28 13:54:49 +02:00
GRL
d38cec0b51
Merge branch 'metadataScriptAPIV2' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-28 13:48:44 +02:00
GRL
651b0a4518
Add test map for changing tiles by script in index
2021-06-28 12:03:06 +02:00
GRL
ed84dacb9c
Merge branch 'develop' of github.com:thecodingmachine/workadventure into metadataScriptAPIV2
2021-06-28 12:01:08 +02:00
David Négrier
330a795fee
Trying to find iframe_api.js URL script dynamically
...
This would allow us to have tests that don't rely on the iframe_api.js from prod, and would allow scripts that target the correct iframe API, no matter if they are running on workadventu.re or on self-hosted maps.
2021-06-28 11:51:13 +02:00
David Négrier
f18291e9d2
Referencing test in index.html and adding some text in the test map.
2021-06-28 10:06:56 +02:00
David Négrier
0b161a2368
Fixing typos
2021-06-28 09:56:18 +02:00
GRL
b182a08ca2
correction from review
2021-06-28 09:33:13 +02:00
jonny
b0eb241fc3
oO something kept movin the comment to the next line
2021-06-25 18:45:15 +02:00
jonny
bbdf0a1289
fixed merge conflict
2021-06-25 18:20:16 +02:00
jonny
7f61e9addd
Merge remote-tracking branch 'remotes/upstream/develop' into tiles-start-positions
2021-06-25 18:14:40 +02:00
jonny
abfa010bbf
added husky to gitignore
2021-06-25 18:07:03 +02:00
jonny
769e0fcc29
refactor to position object
2021-06-25 18:03:43 +02:00
jonny
c7fa5cab8b
cleanup
2021-06-25 17:57:09 +02:00
jonny
f536d538ea
added backwards compatible check and maps
2021-06-25 17:35:42 +02:00
