Commit Graph

2470 Commits

Author SHA1 Message Date
grégoire parant 1c20b33d4e Merge pull request #971 from thecodingmachine/develop
Add error message (#970)
2021-04-30 00:15:40 +02:00
grégoire parant 925545d74f Add error message (#970)
- Error link not found
 - Error user was banned
 - Error access dinied on the world
2021-04-29 23:47:30 +02:00
_Bastler 525441bc31 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-04-29 19:00:23 +02:00
Kharhamel d1ef4a7342 Merge pull request #969 from thecodingmachine/develop
Deployment bis 29/04/2021
2021-04-29 18:47:51 +02:00
Kharhamel 7cd7d22e8b Merge pull request #968 from thecodingmachine/releaseBuild
FIX: now used a slugified tag for prod deployment
2021-04-29 18:46:49 +02:00
kharhamel 0af3657acb FIX: now used a slugified tag for prod deployment 2021-04-29 18:44:46 +02:00
Kharhamel 0b749a4cab Merge pull request #967 from thecodingmachine/develop
Déployment 29/04/2021
2021-04-29 18:32:29 +02:00
Kharhamel b4f2b005e1 Merge pull request #963 from thecodingmachine/releaseBuild
FIX: fixed the deploy workflow to also build images on new releases
2021-04-29 18:20:59 +02:00
kharhamel 7bd524ba55 FIX: fixed the deploy workflow to also build images on new releases 2021-04-29 18:11:24 +02:00
jonny 99bd9d88d9 renamed api method "exitSceneTo" 2021-04-29 10:56:56 +02:00
jonny 99926a89b2 added goToPage.json with the loadPAge Api call to the index.html 2021-04-29 10:55:01 +02:00
jonny 8f1aea1c43 Merge remote-tracking branch 'remotes/workadventure-main/develop' into load-page-api 2021-04-29 10:49:14 +02:00
jonny 8f6c65384a added example script for map exit 2021-04-29 10:43:51 +02:00
Kharhamel 746f1029a8 Merge pull request #687 from malteriechmann/patch-1
Run containers in the background using detached mode
2021-04-29 10:39:47 +02:00
Kharhamel a984151912 Merge pull request #904 from thecodingmachine/improvetestcases
Improving test cases
2021-04-29 10:37:08 +02:00
kharhamel fe27169745 solved conflict with develop 2021-04-29 10:31:16 +02:00
Kharhamel 398326b3aa Merge pull request #959 from thecodingmachine/dependabot/npm_and_yarn/front/ssri-6.0.2
Bump ssri from 6.0.1 to 6.0.2 in /front
2021-04-29 10:18:33 +02:00
David Négrier 2e4b03efff Merge pull request #962 from thecodingmachine/bugfix/add_template_to_single_domain
Adding templater call to single domain startup
2021-04-29 09:45:16 +02:00
David Négrier d29dee3bd4 Adding templater call to single domain startup
The docker-compose.single-domain.yaml was missing a call to the templater script.
As a result, the first run would fail unless docker-compose.yaml was started before.

Closes #947
Closes #957
2021-04-29 09:42:15 +02:00
_Bastler 1783b90d81 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-04-29 08:50:04 +02:00
_Bastler b60e73d0f1 update nes.css style 2021-04-29 08:48:06 +02:00
grégoire parant 19ae575b4f HotFix style help modal (#960) 2021-04-29 01:49:09 +02:00
dependabot[bot] 1e42de9155 Bump ssri from 6.0.1 to 6.0.2 in /front
Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2.
- [Release notes](https://github.com/npm/ssri/releases)
- [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md)
- [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2)

Signed-off-by: dependabot[bot] <support@github.com>
2021-04-28 23:28:10 +00:00
grégoire parant 5c0b5ef74b HotFix release v1.3.1 (#958)
- Update camera style support mobile
 - Fix admin console error
2021-04-29 01:26:09 +02:00
_Bastler bd40c8fe5e nes.css improvements, fix for camerainfo 2021-04-28 13:10:50 +02:00
_Bastler 92122a3272 nes.css style 2021-04-28 07:07:51 +02:00
grégoire parant c2f62e2610 Merge pull request #956 from thecodingmachine/develop
Release 28/04 v1.3.1
2021-04-28 00:01:18 +02:00
Gregoire Parant 16397fe978 Merge branch 'master' into develop 2021-04-27 23:59:25 +02:00
grégoire parant 9b69910cb8 WIP: Update style for mobile (#942)
* Update style for mobile

 - Update style for mobile modale

* Fix overscroll

* Change css properties overflow

* Revert "Change css properties overflow"

This reverts commit 612fcc7e007fb03c7f72e5fa4b8a0604a184ae7d.

* rm image

* Update view mobile

* Fix CI
2021-04-27 23:58:33 +02:00
GRL78 57194fd0a1 Add maps for test (#915) 2021-04-27 23:45:28 +02:00
Kharhamel 94e564f135 Merge pull request #955 from thecodingmachine/fixCleanup
FIX: fixed cleanup for real this time
2021-04-27 18:26:12 +02:00
kharhamel 79701fe227 FIX: fixed cleanup for real this time 2021-04-27 18:18:20 +02:00
Kharhamel 76a21cafa0 Merge pull request #954 from thecodingmachine/restrictCD
FIX: fixed cleanup workflow
2021-04-27 17:28:03 +02:00
kharhamel 3ce5c2ec45 FIX: fixed cleanup workflow 2021-04-27 17:17:54 +02:00
Kharhamel c6ed2c5c57 Merge pull request #953 from thecodingmachine/restrictCD
FIX: fixed cleanup workflow
2021-04-27 17:03:45 +02:00
_Bastler 6ef3d9775c Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-04-27 17:02:06 +02:00
kharhamel 7a8765826e FIX: fixed cleanup workflow 2021-04-27 16:51:57 +02:00
jonny 6295c8275e reset menu items on map change 2021-04-27 16:40:56 +02:00
Kharhamel c19201b636 Merge pull request #952 from thecodingmachine/restrictCD
edited CD domain in deeployer config
2021-04-27 16:37:37 +02:00
kharhamel ea009d912e edited CD domain in deeployer config 2021-04-27 16:30:35 +02:00
Kharhamel 998e051a45 Merge pull request #940 from thecodingmachine/restrictCD
FIX: the deploy action now only start when the label 'deploy' is applied to the PR
2021-04-27 15:49:15 +02:00
jonny 4069e87872 replace menu items if already present 2021-04-27 12:40:29 +02:00
jonny fafaabb6e7 script api can add menu commands
# Conflicts:
#	front/src/Api/IframeListener.ts
#	front/src/iframe_api.ts
2021-04-27 12:07:02 +02:00
jonny 79e530f0e6 launch jsons + type fixes 2021-04-27 00:04:08 +02:00
jonny 6e847b5f58 Merge branch 'develop' of https://github.com/thecodingmachine/workadventure into develop 2021-04-27 00:02:05 +02:00
kharhamel 30cf078df5 FIX: the deploy action now only start when the label 'deploy' is applied to the PR 2021-04-26 18:33:03 +02:00
_Bastler daa7ff5c19 Merge branch 'develop' of github.com:thecodingmachine/workadventure into main 2021-04-26 16:08:04 +02:00
grégoire parant 4e09246c7f Merge pull request #939 from thecodingmachine/develop
Release 26/04/2021
2021-04-26 13:42:27 +02:00
David Négrier ca628d9a90 Merge pull request #901 from thecodingmachine/text_display
Adding the ability to display "Text" objects from Tiled
2021-04-26 11:30:34 +02:00
David Négrier 08ca95b143 Fixing WorkWrap 2021-04-26 11:28:15 +02:00