Commit Graph

59 Commits

Author SHA1 Message Date
David Négrier
686427f6fe Merge branch 'develop' of github.com:thecodingmachine/workadventure into fix/deploy-cleanup
# Conflicts:
#	front/Dockerfile
2021-02-01 14:00:07 +01:00
David Négrier
675c043cb5 Removing website container entirely from project (as it is specific to the WorkAdventure company and not to the WorkAdventure self-installed project) 2021-01-18 19:39:22 +01:00
Piotr Dobrowolski
33b9bd773f *: Dockerfiles cleanup, docker-compose.prod.yaml
New docker-compose.prod.yaml should provide a production-ish deployment
of WorkAdventure
2021-01-12 22:32:37 +01:00
David Négrier
76dee71a5f Improving doc: the tile layer format must be CSV 2020-12-20 22:31:06 +01:00
David Négrier
0feba8be8f Removing reference to tutorial map until it is production ready 2020-12-17 22:08:51 +01:00
Gregoire Parant
e77eb6d5be Typo fixes 2020-12-17 18:19:47 +01:00
David Négrier
055131ac66 Typo fixes 2020-12-17 15:20:42 +01:00
Gregoire Parant
2236879462 Fix erreur name on website
- replace WorkAdventure => WorkAdventure
2020-12-17 14:34:24 +01:00
Gregoire Parant
8947e1b781 update pointer style 2020-12-15 17:31:55 +01:00
Kharhamel
4680c65500
Merge pull request from thecodingmachine/website-demo
Update website
2020-12-15 16:29:36 +01:00
Gregoire Parant
403400b170 Fixe url demo anonymous 2020-12-15 16:03:59 +01:00
Gregoire Parant
22eb941084 Update css and cursor website 2020-12-15 09:17:09 +01:00
Gregoire Parant
794c13c8d5 Fixe url admin 2020-12-15 08:30:02 +01:00
Gregoire Parant
f8c3a10930 Update website for demo and anonymous conection 2020-12-14 20:27:56 +01:00
David Négrier
7e2e530f9f
Merge pull request from thecodingmachine/doc_for_collides
Adding documentation for "collides" property
2020-12-14 17:01:39 +01:00
David Négrier
8a1a23e82b Adding documentation for "collides" property 2020-12-14 16:53:04 +01:00
dependabot[bot]
3b612d9848
Bump ini from 1.3.5 to 1.3.7 in /website
Bumps [ini](https://github.com/isaacs/ini) from 1.3.5 to 1.3.7.
- [Release notes](https://github.com/isaacs/ini/releases)
- [Commits](https://github.com/isaacs/ini/compare/v1.3.5...v1.3.7)

Signed-off-by: dependabot[bot] <support@github.com>
2020-12-11 13:25:50 +00:00
David Négrier
6f2c319785 Merge branch 'master' of github.com:thecodingmachine/workadventure into scaling
# Conflicts:
#	back/src/Services/SocketManager.ts
#	deeployer.libsonnet
#	docker-compose.yaml
#	front/src/Connexion/RoomConnection.ts
#	front/src/Enum/EnvironmentVariable.ts
#	front/src/Phaser/Game/GameScene.ts
#	front/webpack.config.js
#	pusher/src/Controller/IoSocketController.ts
2020-12-11 13:00:11 +01:00
David Négrier
2fba6956a6 Fixing typo in doc 2020-12-02 17:51:59 +01:00
David Négrier
4c1e566a6c Adding a Pusher container as a middleware/dispatcher between front and back 2020-11-26 17:53:30 +01:00
grégoire parant
22217e27be
Merge pull request from thecodingmachine/dependabot/npm_and_yarn/website/dot-prop-4.2.1
Bump dot-prop from 4.2.0 to 4.2.1 in /website
2020-11-23 15:40:33 +01:00
kevin
a969e33bee fix email 2020-11-18 12:21:42 +01:00
kevin
62a1732e53 wording changes 2020-11-18 08:40:42 +01:00
dependabot[bot]
b8bafe9c7e
Bump dot-prop from 4.2.0 to 4.2.1 in /website
Bumps [dot-prop](https://github.com/sindresorhus/dot-prop) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/sindresorhus/dot-prop/releases)
- [Commits](https://github.com/sindresorhus/dot-prop/compare/v4.2.0...v4.2.1)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-17 14:26:58 +00:00
David Négrier
71e2c92f7b
Update website/dist/create-map.html 2020-11-06 16:46:28 +01:00
David Négrier
d0f643cfa6
Update website/dist/choose-map.html 2020-11-06 16:46:22 +01:00
kevin
467cf3260f change 'play private' to 'work in privtae', fix broken html, add homepage link in inner pages 2020-11-06 06:57:56 +01:00
kevin
8e1e2596e5 changing typos on Home Page 2020-11-05 23:17:58 +01:00
David Négrier
59ae5f6b47 Fixing TCM map URL in Choose your map page 2020-10-16 10:01:20 +02:00
David Négrier
36d73333f5 Adding exitUrl property
The exitUrl property can be applied on a layer to link to any kind of room (private or public)
2020-10-15 15:50:51 +02:00
David Négrier
12aecaff06
Merge pull request from thecodingmachine/dependabot/npm_and_yarn/website/elliptic-6.5.3
Bump elliptic from 6.4.1 to 6.5.3 in /website
2020-10-08 16:03:53 +02:00
dependabot[bot]
607b495644
Bump lodash from 4.17.15 to 4.17.20 in /website
Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.20.
- [Release notes](https://github.com/lodash/lodash/releases)
- [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.20)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-08 10:04:31 +00:00
dependabot[bot]
78e7f481d5
Bump elliptic from 6.4.1 to 6.5.3 in /website
Bumps [elliptic](https://github.com/indutny/elliptic) from 6.4.1 to 6.5.3.
- [Release notes](https://github.com/indutny/elliptic/releases)
- [Commits](https://github.com/indutny/elliptic/compare/v6.4.1...v6.5.3)

Signed-off-by: dependabot[bot] <support@github.com>
2020-10-08 10:04:29 +00:00
David Négrier
9351719873 Adding the notion of silent zone 2020-08-31 14:10:01 +02:00
David Négrier
0a8ba37049 Adding Jitsi meet support 2020-08-31 12:18:00 +02:00
David Négrier
01319b50ca Adding a "openWebsite" property that opens websites when we walk over the zone. 2020-08-30 17:37:38 +02:00
David Négrier
5a56604038 Adding documentation page regarding editing your own map
This commit adds a new documentation page to the website explaining how to create your own map.
2020-07-05 19:08:37 +02:00
Hugo Averty
7067312659 Merging develop and landing-nip 2020-06-24 18:07:58 +02:00
Hugo Averty
afb0aee89e Title color 2020-06-24 15:55:47 +02:00
Hugo Averty
938dfb12cd Adding gif and modifying text 2020-06-24 15:42:55 +02:00
Hugo Averty
99a8b42924 Adding gif and modifying text 2020-06-24 15:42:44 +02:00
Hugo Averty
4552f26413 Modifying text 2020-06-16 14:23:23 +02:00
Hugo Averty
d2e2448291 Accessibility for titles header 2020-06-16 13:56:07 +02:00
Hugo Averty
8e67a41063 Adding fixed bubbles 2020-06-16 13:51:25 +02:00
Hugo Averty
d54e884063 Adding full screen (vh) story 2020-06-14 13:29:47 +02:00
Hugo Averty
f9ff8d7ddc Fix images missing 2020-06-14 12:02:46 +02:00
Hugo Averty
e9cf902a4a Fix images missing 2020-06-14 11:59:25 +02:00
Hugo Averty
81630979c7 Fix images missing 2020-06-14 11:50:06 +02:00
Hugo Averty
5c8aa80b24 Add story of Leymah to landing page 2020-06-14 11:32:15 +02:00
NIP
6adce0808f Fix sharing links 2020-06-09 12:34:44 +02:00