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

3106 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
_Bastler
5e6ffd9fa2 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-23 18:47:36 +02:00
Kharhamel
bf0c333266
Merge pull request #1463 from thecodingmachine/dependabot/npm_and_yarn/front/axios-0.21.2 
Bump axios from 0.21.1 to 0.21.2 in /front
 2021-09-23 18:36:51 +02:00
Kharhamel
ff5c2c5e58
Merge pull request #1464 from thecodingmachine/dependabot/npm_and_yarn/back/axios-0.21.2 
Bump axios from 0.21.1 to 0.21.2 in /back
 2021-09-23 18:36:45 +02:00
Kharhamel
d2bf7b8fde
Merge pull request #1465 from thecodingmachine/dependabot/npm_and_yarn/pusher/axios-0.21.2 
Bump axios from 0.21.1 to 0.21.2 in /pusher
 2021-09-23 18:36:34 +02:00
_Bastler
3b4cf0a68c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-21 21:10:09 +02:00
GRL78
3f1c5246f8
TO MERGE : Contact page from Admin or Environment Variable (#1401) 
* Contact page from Admin or Environment Variable

* Get contact page from admin by pusher

* Changes requested

* Modify contactPageStore management

* documentation environment variables

Co-authored-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-21 20:24:53 +02:00
_Bastler
d305a91ffd Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-21 19:47:56 +02:00
Kharhamel
ccea46fe2b
Merge pull request #1476 from thecodingmachine/fixCustomWoka 
FIX: added another catch case for default model
 2021-09-21 17:45:31 +02:00
Kharhamel
8b099e5725 FIX: added another catch case for default model 2021-09-21 14:29:15 +02:00
Gregoire Parant
3f954d273c Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-21 02:37:56 +02:00
grégoire parant
e77d4dda84
Update favicon and logo to deploy new design (#1475) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-20 22:42:15 +02:00
_Bastler
d3a24b06c2 change room slug 2021-09-20 19:31:51 +02:00
_Bastler
0164d24329 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 16:25:25 +02:00
Kharhamel
2fbf8f0a10
Merge pull request #1474 from Lurkars/twemojiEmoteMenuSvelte 
fix wrong font name
 2021-09-20 15:54:31 +02:00
Lurkars
781c69387c fix wrong font name 2021-09-20 15:22:54 +02:00
_Bastler
49bd6f8a1c Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 15:17:30 +02:00
_Bastler
31579283cd fix connection type 2021-09-20 15:06:44 +02:00
dependabot[bot]
8ecef9eadc
Bump axios from 0.21.1 to 0.21.2 in /front 
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-20 12:34:07 +00:00
dependabot[bot]
16d45c921f
Bump axios from 0.21.1 to 0.21.2 in /back 
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-20 12:34:04 +00:00
dependabot[bot]
62c163f11e
Bump axios from 0.21.1 to 0.21.2 in /pusher 
Bumps [axios](https://github.com/axios/axios) from 0.21.1 to 0.21.2.
- [Release notes](https://github.com/axios/axios/releases)
- [Changelog](https://github.com/axios/axios/blob/master/CHANGELOG.md)
- [Commits](https://github.com/axios/axios/compare/v0.21.1...v0.21.2)

---
updated-dependencies:
- dependency-name: axios
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-09-20 12:34:04 +00:00
Kharhamel
9b13a6780c
Merge pull request #1437 from Lurkars/twemojiEmoteMenuSvelte 
Twemoji emote menu svelte (upgrade of #1301)
 2021-09-20 14:33:16 +02:00
_Bastler
54346896b9 fix 2021-09-20 09:53:25 +02:00
_Bastler
1e43229956 fix? 2021-09-20 09:33:50 +02:00
_Bastler
afa12641aa undo 2021-09-20 09:30:36 +02:00
_Bastler
9650453edc quick fix 2021-09-20 09:27:18 +02:00
_Bastler
22c501e5e0 quick fix? 2021-09-20 09:24:47 +02:00
_Bastler
6af1651e03 remove instance, change room url, fix invalid lastRoomUrls 2021-09-20 08:56:14 +02:00
_Bastler
ccafaf11e3 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-20 08:55:41 +02:00
Gregoire Parant
f247ec44f1 Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-18 12:20:02 +02:00
grégoire parant
8c96b514d4
HotFix to test hydra connexion (#1471) 2021-09-18 11:35:29 +02:00
_Bastler
0c16f08f4e fix quill build 2021-09-17 15:52:07 +02:00
_Bastler
7504580e43 fix quill.css 2021-09-17 15:47:17 +02:00
_Bastler
29b9d29b7d add quill css 2021-09-17 15:41:48 +02:00
_Bastler
ea64e79e46 fix localuser for OIDC 2021-09-17 14:02:43 +02:00
_Bastler
f053ece7da remove old, fix nginx 2021-09-17 10:23:00 +02:00
_Bastler
0bf49fa26a native OIDC support 2021-09-17 09:46:04 +02:00
_Bastler
3a9ffd7557 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-16 18:39:06 +02:00
_Bastler
b47201687a better we.bslty & deveop integration 2021-09-16 18:24:03 +02:00
Lurkars
63c4eeb4c7 Merge branch 'twemojiEmoteMenuSvelte' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:20:42 +02:00
Lurkars
7922de10ff Merge branch 'develop' of github.com:thecodingmachine/workadventure into twemojiEmoteMenuSvelte 2021-09-16 18:12:51 +02:00
grégoire parant
553902e52a
Add log for Oauth login connexion (#1468) 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2021-09-16 17:57:14 +02:00
David Négrier
9f39cf154a
Merge pull request #1467 from thecodingmachine/master 
Backporting changes to develop
 2021-09-16 17:49:05 +02:00
David Négrier
8d0f53ada0 Merge branch 'develop' of github.com:thecodingmachine/workadventure 2021-09-16 17:04:43 +02:00
David Négrier
bc45c93932 Fixing Posthog env var 2021-09-16 17:03:49 +02:00
David Négrier
7ef27a0040 Updating Changelog 2021-09-16 16:46:48 +02:00
David Négrier
4728c3a59a Merge branch 'master' of github.com:thecodingmachine/workadventure 2021-09-16 16:46:27 +02:00
David Négrier
950ffaafda
Merge pull request #1466 from thecodingmachine/develop 
Deploy 2021-09-16
 2021-09-16 16:22:50 +02:00
Kharhamel
483191c521
Merge pull request #1458 from thecodingmachine/posthog 
FEATURE: added posthog as new analytics tool
 2021-09-16 15:24:27 +02:00
Kharhamel
2e111aa13a FEATURE: added posthog as new analytics tool 2021-09-16 15:16:10 +02:00
David Négrier
a3eebb05ba Fixing type of openWebsiteWidth in doc 2021-09-16 09:58:42 +02:00