_Bastler/partey_workadventure
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,267 Commits 2 Branches 0 Tags 47 MiB
e68f1d4364
Commit Graph

2513 Commits

Author SHA1 Message Date
Benedicte Quimbert
a4234268b2 Makes the default setting: camera off and mic on 2022-03-23 10:48:50 +01:00
Piotr 'pwh' Hanusiak
f755e68327 Press Start 2P font on buttons 2022-03-23 10:12:34 +01:00
Alexis Faizeau
418a8cc634 Remove login name scene on logout button event 2022-03-22 17:52:22 +01:00
Benedicte Quimbert
1681373d88 Adds test map 2022-03-22 17:42:11 +01:00
Piotr 'pwh' Hanusiak
fcf8659829 cleanup 2022-03-22 16:53:23 +01:00
Piotr 'pwh' Hanusiak
f446918e42 start normally 2022-03-22 16:49:20 +01:00
Benedicte Quimbert
a80f7ced44 Adds the todo about German translation 2022-03-22 16:48:02 +01:00
David Négrier
f1549a0ee0 Removing the temporary error message when moving to open id screen 2022-03-22 15:05:44 +01:00
David Négrier
e20a8caa26 Allowing iframeAuthentication URL (stored in OPID_LOGIN_SCREEN_PROVIDER) to be non-absolute. 2022-03-22 15:05:44 +01:00
Piotr 'pwh' Hanusiak
dae8619a6b Merge branch 'refactor_wokas' into new_custom_woka_scene 2022-03-22 15:05:33 +01:00
Piotr 'pwh' Hanusiak
87034a453e set starting parts on 0 indices 2022-03-22 14:39:47 +01:00
Piotr 'pwh' Hanusiak
11a262b178 make sure horizontal iPhoneX displays view properly 2022-03-22 13:37:41 +01:00
Piotr 'pwh' Hanusiak
d971c7e064 randomize and finish buttons 2022-03-22 11:56:22 +01:00
Piotr 'pwh' Hanusiak
2cf55cac7e crispy pixels 2022-03-22 09:44:26 +01:00
David Négrier
66aeb21fbb Restoring icons deleted by error 2022-03-22 09:14:59 +01:00
Benedicte Quimbert
216f34c113 switches dropdown for checkboxes and adjusts wording 2022-03-21 19:13:24 +01:00
Piotr 'pwh' Hanusiak
ccf897f320 fixing grid. wip 2022-03-21 16:44:51 +01:00
Valdo
6d9a3f45dc
Allow audio (#1991) 
* Removing old unused images

Just a bit of cleanup!

* Allow audio feature

* Pretty

* Ignored screenshot folder

* Added manual test

* Simplified test map

Co-authored-by: Valdo Romao <v.romao@thecodingmachine.com>
 2022-03-21 16:22:51 +01:00
Piotr 'pwh' Hanusiak
a340c9bd96 simplification of resizing 2022-03-21 14:53:37 +01:00
Benedicte Quimbert
9442c9c9f1 PrivacyShutdownStore modifies constraints according to the user's setting 2022-03-21 14:33:20 +01:00
Benedicte Quimbert
453ccb7745 Adds settings options and localUser functions 2022-03-21 14:33:20 +01:00
Piotr 'pwh' Hanusiak
159bf0351f fighting with not cripsy pixels when resizing 2022-03-21 12:38:12 +01:00
David Négrier
705c75e3c7 Adding wokalist type checking on front 
Additionally, we are making superLoad.json accept a new "immediateCallback" parameter that resolves during the event handler (and not after)
 2022-03-21 11:29:18 +01:00
Gregoire Parant
e618dc6c3d Refactor connexion manager 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-03-20 14:33:25 +01:00
Gregoire Parant
29a0b9c5ae Refactor access by token 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-03-19 07:11:15 +01:00
David Négrier
6e52f280d0 Properly catching promises 2022-03-18 18:11:32 +01:00
David Négrier
375f78ca30 Adding missing powered by images 2022-03-18 18:11:32 +01:00
David Négrier
9f79e595a5 Migrating Loader bar to SuperLoad and fixing Resize issue on loader 2022-03-18 18:11:32 +01:00
David Négrier
c529658ef4 Adding first version of SuperLoader 
This class is the Phaser loader as it should be: it comes with promises,
can be easily run out of the "preload" phase and won't crash if the
scene is destroyed before textures are loaded.
 2022-03-18 18:11:32 +01:00
David Négrier
ea3088a876 Adding a "powered by WorkAdventure" logo in case custom logos are used 
If a custom logo is used, we are adding a "powered by WorkAdventure" small logo at the bottom of the "enter your name" screen.
 2022-03-18 18:11:32 +01:00
Gregoire Parant
a16f2c7534 Refactor how to use new Jitsi icon 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-03-18 18:11:32 +01:00
Piotr 'pwh' Hanusiak
cd42f30aa7 hide voice indicator for player leaving still existing bubble conversation 2022-03-18 17:58:41 +01:00
David Négrier
6890e2579c Removing old unused images 
Just a bit of cleanup!
 2022-03-18 17:58:41 +01:00
Piotr 'pwh' Hanusiak
a10f327f45 hide voice indicator for player leaving still existing bubble conversation 2022-03-18 17:46:28 +01:00
Alexis Faizeau
539a273263
Revert "Stabilize screensharing (#1982)" (#1984) 
This reverts commit 33e78060d4.
 2022-03-18 17:37:02 +01:00
Alexis Faizeau
15a0a2d1eb Add check if cowebsite still exist before highlight 2022-03-18 16:44:15 +01:00
Alexis Faizeau
c51fe1cfed
Translate camera help (#1983) 
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
 2022-03-18 11:50:48 +01:00
Alexis Faizeau
9c99d760f7 Close socket connection on not authorized woka 2022-03-18 11:49:41 +01:00
Alexis Faizeau
33e78060d4
Stabilize screensharing (#1982) 
Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
 2022-03-17 17:50:39 +01:00
Piotr 'pwh' Hanusiak
9a7e5cae4c populate grid on resize 2022-03-17 16:48:40 +01:00
Piotr 'pwh' Hanusiak
744c15920b fixed bug with animation not showing up to date state of the outfit 2022-03-17 15:49:05 +01:00
Piotr 'pwh' Hanusiak
a3fcf2dc3f populating grid 2022-03-17 13:58:54 +01:00
Piotr 'pwh' Hanusiak
701c5f65cd independent parts preview 2022-03-17 11:58:12 +01:00
Piotr 'pwh' Hanusiak
7703a76689 show body parts previews 2022-03-17 11:03:04 +01:00
Gregoire Parant
56fb73c682 Change roomId by playUri 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-03-17 10:53:56 +01:00
Gregoire Parant
0e7a52aa58 update with dan suggest 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-03-17 10:38:52 +01:00
Gregoire Parant
5448596f01 Merge branch 'develop' into changeRegisterAccess 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	pusher/src/Services/AdminApi.ts
 2022-03-17 09:54:24 +01:00
Gregoire Parant
d9407a3428 Add * in access location of nginx configuration 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-03-16 15:52:29 +01:00
David Négrier
37e824c494 Fixing setInterval not freed for some volume analyzers 
Also: using a 256 fftSize instead of 2048 to save on CPU cycles.
 2022-03-16 15:34:39 +01:00
Piotr 'pwh' Hanusiak
a22504b354 fix bug with grid not showing starting positions on resize 2022-03-16 15:05:47 +01:00
Piotr 'pwh' Hanusiak
ac48a42903 further work on vertical layout 2022-03-16 14:05:35 +01:00
Piotr 'pwh' Hanusiak
fb020e22c7 entirely different approach to layout 2022-03-16 13:25:39 +01:00
David Négrier
53b184e82b Adding support for custom logos 
The admin can now set custom logos for the login scene and for the loading screen.
 2022-03-15 18:16:56 +01:00
David Négrier
79db6c8f3b Fixing a race condition in Jitsi 
When setting the name, in rare cases, Jitsi was not initialized yet and setting the name would cause a JS error.
We are now waiting for Jitsi to be properly initialized before setting the name.
 2022-03-15 17:50:56 +01:00
David Négrier
b959ce7a6d Migrating some promises to Deferred objects to simplify the code. 2022-03-15 13:51:36 +01:00
David Négrier
153bffd521 Wait for main character to be loaded to display the GameScene 
This change makes sure the character of the current player is fully loaded before we display the game scene.
Otherwise, you could have a glitch for 0.5-2 seconds between the GameScene being displayed and the actual character being displayed.
 2022-03-15 13:51:36 +01:00
David Négrier
3988559d2a Removing old unused images 
Just a bit of cleanup!
 2022-03-15 13:51:10 +01:00
Piotr 'pwh' Hanusiak
43bac6c5cf get rid of zoom factor 2022-03-15 11:31:01 +01:00
David Négrier
b6b6c7f15f Adding error case when texture is empty 2022-03-14 14:28:42 +01:00
David Négrier
52b5027702 Adding source maps to production build. 2022-03-14 13:55:30 +01:00
David Négrier
352f144e97
Merge pull request #1963 from thecodingmachine/develop 
Deploy 2022-03-14
 2022-03-14 13:01:10 +01:00
Piotr Hanusiak
d4dcd0d5ce
Actions menu api (#1862) 
* wip

* wip

* random action on click

* removing actions

* register single key per command use

* change removeActionsMenu action name

* fixed actions menu not hiding content properly:

* actions menu fix

* added mock Block Player action

* ActionsMenu buttons styling

* added displaying priority for menu actions

* moved utils actionMenu features to the UI

* import as a type:

* more object oriented style for API

* removed registered actions from RemotePlayer instance

* readme update

* Fixing typos / Improving wording

* added instructions on AlterActionsMenu test map

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-03-14 10:15:10 +01:00
Lurkars
55db6a9b12
apply textures on openid login, fix pusher errors on woka list (#1961) 
* apply textures on openid login, fix pusher errors on woka list

* remove logging

* Returning a HTTP 400 id roomUrl parameter not set

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-03-14 10:14:35 +01:00
David Négrier
6540f15c5b
Refactoring Woka management (#1810) 
* Wrap websockets with HyperExpress

* Add endpoints on pusher to resolve wokas

* getting textures urls from pusher

* Adding OpenAPI documentation for the pusher.

The pusher now exposes a "/openapi" endpoint and a "/swagger-ui/" endpoint.

* revert FRONT_URL

* playerTextures metadata is being loaded via Phaser.Loader

* fetch textures every time character or customize scene is open

* Heavy changes: refactoring the pusher to always send the textures (and the front to accept them)

* Sending character layer details to admin

* Cleaning commented code

* Fixing regex

* Fix woka endpoints on pusher

* Change error wording on pusher

* Working on integration of the woka-list with the new admin endpoint.

* Switching from "name" to "id" in texture object + using zod for woka/list validation

* Add position on default woka data

* Remove async on pusher option method

* Fix woka list url

* add options for /register

* Fxiing loading the Woka list

* Actually returning something in logout-callback

* Copying messages to back too

* remove customize button if no body parts are available (#1952)

* remove customize button if no body parts are available

* remove unused position field from PlayerTexturesCollection interface

* removed unused label field

* fix LocalUser test

* little PlayerTextures class refactor

* Fixing linting

* Fixing missing Openapi packages in prod

* Fixing back build

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>

* Add returns on pusher endpoints

Co-authored-by: Alexis Faizeau <a.faizeau@workadventu.re>
Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: Piotr Hanusiak <wacneg@gmail.com>
 2022-03-11 17:02:58 +01:00
Piotr 'pwh' Hanusiak
9644512d68 different animations for previewer 2022-03-11 16:05:39 +01:00
Piotr 'pwh' Hanusiak
6d50d15630 different approach for displaying preview 2022-03-11 15:21:51 +01:00
Piotr Hanusiak
2a73400f7c
remove customize button if no body parts are available (#1952) 
* remove customize button if no body parts are available

* remove unused position field from PlayerTexturesCollection interface

* removed unused label field

* fix LocalUser test

* little PlayerTextures class refactor

* Fixing linting

* Fixing missing Openapi packages in prod

* Fixing back build

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
 2022-03-11 14:30:00 +01:00
Piotr 'pwh' Hanusiak
138e8aece4 better woka preview, wip 2022-03-11 13:36:55 +01:00
David Négrier
4ebb25e6ea Merge branch 'develop' of github.com:thecodingmachine/workadventure into refactor_wokas 2022-03-11 11:55:30 +01:00
Hanusiak Piotr
9f823506b9 little PlayerTextures class refactor 2022-03-10 16:18:47 +01:00
Hanusiak Piotr
5a8cba24fa much cleaner approach to group lock update 2022-03-10 12:20:53 +01:00
Hanusiak Piotr
060cdf3310 fix LocalUser test 2022-03-10 09:50:41 +01:00
Hanusiak Piotr
b3e896d9fc removed unused label field 2022-03-10 09:24:31 +01:00
Hanusiak Piotr
3a5aa3c3c5 cr fixes #1 wip 2022-03-09 16:51:11 +01:00
Hanusiak Piotr
fb05037594 remove unused position field from PlayerTexturesCollection interface 2022-03-09 14:11:15 +01:00
Hanusiak Piotr
e5095db048 remove customize button if no body parts are available 2022-03-09 12:45:04 +01:00
David Négrier
674c5bdeb8 Fxiing loading the Woka list 2022-03-09 11:22:33 +01:00
Piotr Hanusiak
0196eae055
async call for recalculating tiles costs (#1890) 
* async call for recalculating tiles costs

* fixed setWalkingCostGrid still being a blocking process

* set exits tiles cost from the start

* removed typing error from code

Co-authored-by: Hanusiak Piotr <piotr@ltmp.co>
 2022-03-08 16:28:54 +01:00
Lukas
7b26d16868
lazy load EmoteMenu (#1938) 2022-03-08 11:56:34 +01:00
Lukas
2938aba484
Multi-platform images (#1924) 
* base front production image on official nginx

* build multi-platform docker images

* build message types outside docker

* set docker build context to path

* build message types before running e2e tests

* add build for arm/v7

* remove build for arm/v7

* increase yarn network timeout

* set front port to 80

* add git labels to images

https://github.com/docker/build-push-action/blob/master/UPGRADE.md#tags-with-ref-and-git-labels

* add images input

* Adding back commented code in the Dockerfile (the protobuf message building).

This way, when node-grpc supports ARM64, we can uncomment the code again.

Co-authored-by: David Négrier <d.negrier@thecodingmachine.com>
Co-authored-by: Lukas Hass @lukashass
 2022-03-08 11:21:17 +01:00
David Négrier
07a4df8ad4 Importing Window object back in Iframe API 2022-03-07 18:35:17 +01:00
Alexis Faizeau
9300b05335 Fix woka list url 2022-03-04 10:52:32 +01:00
Hanusiak Piotr
3c74b2b554 remove obsolete check 2022-03-03 15:21:44 +01:00
Anton Bracke
4535a8ae96
Merge remote-tracking branch 'upstream/develop' into electron 2022-03-03 14:43:33 +01:00
Hanusiak Piotr
363b906cb8 group circles with color fill 2022-03-03 14:36:16 +01:00
Hanusiak Piotr
a0535ed4a8 Updating GroupDescriptors on LockGroupMessage 2022-03-03 12:22:16 +01:00
Hanusiak Piotr
a0205bf682 cleanup 2022-03-02 17:00:43 +01:00
Hanusiak Piotr
ef22d4ba20 listening to lockGroupMessage on front 2022-03-02 10:44:26 +01:00
Hanusiak Piotr
d43c8d181a sending info about group lock state. wip 2022-03-01 11:36:45 +01:00
Hanusiak Piotr
724dbc8efa send group userIds to players 2022-02-28 13:47:08 +01:00
Lurkars
0a2bfc556f Merge branch 'develop' of github.com:thecodingmachine/workadventure into oidcProfile 2022-02-28 10:35:15 +01:00
Lurkars
c3b3d5e9d6
Fix nginx.conf to work with OIDC (#1932) 
* fix nginx.conf to work with OIDC
* rewrite like .htaccess
 2022-02-28 09:07:38 +01:00
Lukas
f1cba60825
base front production image on official nginx image 2022-02-25 20:32:10 +01:00
Lukas
3f3af9b957
improve docker build caching 
install dependencies before copying source into image
 2022-02-25 18:53:14 +01:00
David Négrier
08fffab410 Switching from "name" to "id" in texture object + using zod for woka/list validation 2022-02-25 17:05:34 +01:00
David Négrier
3a9ce7615d
Merge pull request #1914 from thecodingmachine/dependabot/npm_and_yarn/front/ansi-regex-5.0.1 
Bump ansi-regex from 5.0.0 to 5.0.1 in /front
 2022-02-25 14:10:21 +01:00
David Négrier
da469b64d2 Working on integration of the woka-list with the new admin endpoint. 2022-02-24 21:09:19 +01:00
David Négrier
378a95962a Heavy changes: refactoring the pusher to always send the textures (and the front to accept them) 2022-02-23 21:13:11 +01:00
Hanusiak Piotr
d65fe0ee26 fetch textures every time character or customize scene is open 2022-02-23 19:53:55 +01:00
Hanusiak Piotr
063de6d1ca playerTextures metadata is being loaded via Phaser.Loader 2022-02-23 19:53:55 +01:00
Hanusiak Piotr
52e15eccfa revert FRONT_URL 2022-02-23 19:53:54 +01:00
Hanusiak Piotr
80761804a7 getting textures urls from pusher 2022-02-23 19:53:54 +01:00
Alexis Faizeau
2161a40e05 Add endpoints on pusher to resolve wokas 2022-02-23 19:53:54 +01:00
Hanusiak Piotr
8d8857011e removed unused imports 2022-02-23 14:40:19 +01:00
Hanusiak Piotr
9fe4782fbd clear hashParams after moving player with moveTo param 2022-02-23 10:14:09 +01:00
Gregoire Parant
07d399403b Refactor how to use new Jitsi icon 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-23 00:27:07 +01:00
Gregoire Parant
658781e02e Merge branch 'master' into develop 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>

# Conflicts:
#	front/public/resources/logos/meet.svg
 2022-02-22 23:40:48 +01:00
Gregoire Parant
3541f153fa Push Jitsi icon 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-22 23:37:28 +01:00
Anton Bracke
4e243151dd
add desktop api to front 2022-02-22 16:57:56 +01:00
dependabot[bot]
3aef82303c
Bump ansi-regex from 5.0.0 to 5.0.1 in /front 
Bumps [ansi-regex](https://github.com/chalk/ansi-regex) from 5.0.0 to 5.0.1.
- [Release notes](https://github.com/chalk/ansi-regex/releases)
- [Commits](https://github.com/chalk/ansi-regex/compare/v5.0.0...v5.0.1)

---
updated-dependencies:
- dependency-name: ansi-regex
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-21 16:27:29 +00:00
Gregoire Parant
0943ec8991 Define color text by brightness 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-21 01:09:53 +01:00
Gregoire Parant
070ad6b993 Add jiti logo for Jitsi button meeting 2022-02-20 23:38:20 +01:00
Gregoire Parant
23f7d6f08f Update CoWebsite Jitsi 
- Change Jitsi meeting icon
 - Add Jitsi meeting information

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-20 23:28:27 +01:00
Lukas Hass
3ee9b26650
use optional chaining 2022-02-19 20:25:17 +01:00
Lukas Hass
e8d5335bc0
Merge branch 'develop' into vite 2022-02-19 20:08:50 +01:00
Lukas Hass
cc24fd48d5
update generic-type-guard and @geprog/vite-plugin-env-config 
allows to get rid of node built-in polyfills
 2022-02-19 00:13:25 +01:00
Gregoire Parant
e4f9f89a40 Fix pretty 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-18 21:57:11 +01:00
Gregoire Parant
26f5416b63 Fix svelt check 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-18 21:44:17 +01:00
Gregoire Parant
3a734cc2ae Enable limitation freemium 
- Fix warning message
 - Fix post message API pusher

Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-18 21:33:23 +01:00
dependabot[bot]
707b78b506
Bump url-parse from 1.5.3 to 1.5.7 in /front 
Bumps [url-parse](https://github.com/unshiftio/url-parse) from 1.5.3 to 1.5.7.
- [Release notes](https://github.com/unshiftio/url-parse/releases)
- [Commits](https://github.com/unshiftio/url-parse/compare/1.5.3...1.5.7)

---
updated-dependencies:
- dependency-name: url-parse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-17 14:52:03 +00:00
Lukas Hass
2755489ccf
Merge branch 'develop' into vite 2022-02-17 15:20:58 +01:00
Lukas Hass
c163107875
import browserified version of simple-peer 2022-02-17 15:02:48 +01:00
Hanusiak Piotr
ecd4b5907a disable corner cutting 2022-02-17 12:44:57 +01:00
Alexis Faizeau
f186111d2f Fix importing coWesbite from API to store 2022-02-17 09:51:32 +01:00
Gregoire Parant
f0c7e4ea8a Update css warning message & add message button 
Signed-off-by: Gregoire Parant <g.parant@thecodingmachine.com>
 2022-02-16 20:15:16 +01:00
David Négrier
eae6c2c5e3
Merge pull request #1887 from thecodingmachine/master 
Backporting cowebsites hot-fixes
 2022-02-16 18:03:23 +01:00
David Négrier
a7264954ea
Merge pull request #1820 from thecodingmachine/feature-voice-chat-indicator 
Feature voice chat indicator
 2022-02-16 16:46:13 +01:00
Hanusiak Piotr
e590cee753 forcing close talkIcon indicator when leaving bubble conversation 2022-02-16 15:55:07 +01:00
Hanusiak Piotr
0b0d3b5beb fixed issue with chat indicator persisting after being out of conversation 2022-02-16 14:56:59 +01:00
Hanusiak Piotr
dea5784c9b Merge branch 'develop' into feature-voice-chat-indicator 2022-02-16 14:37:01 +01:00
Hanusiak Piotr
3c54e38401 unlock diagonal movement 2022-02-16 14:28:35 +01:00
Hanusiak Piotr
3875d3b0f5 Merge branch 'develop' into avoid-exits-on-path 2022-02-16 14:03:48 +01:00
Lurkars
2816946c94 add OIDC username + locale 2022-02-16 09:11:08 +01:00
Lukas Hass
620e218612
remove iframe.html 2022-02-15 20:19:45 +01:00
Alexis Faizeau
06dd2202f6 Fix hidden main cowebsite swape 2022-02-15 17:28:15 +01:00
Alexis Faizeau
a52ad233d8 Fix cowebsite swap 2022-02-15 17:28:02 +01:00
Alexis Faizeau
0f16d909e7 The second opened cowebsite must be displayed on highlighted 2022-02-15 17:27:32 +01:00
Lukas Hass
cdc3d182bc
fix comparison that is always false 2022-02-15 12:00:32 +01:00
Lukas Hass
8c96a986fb
remove webpack reference 2022-02-15 11:07:04 +01:00
Lukas Hass
779f5c1fdb
Merge branch 'develop' into vite 2022-02-14 22:11:53 +01:00
Lukas Hass
ae8c18fa4b
prevent reading property 'collides' of undefined 
fixes e2e tests
 2022-02-14 22:07:15 +01:00
David Négrier
8c8fdb9ee0
Merge pull request #1858 from thecodingmachine/dependabot/npm_and_yarn/front/follow-redirects-1.14.8 
Bump follow-redirects from 1.14.7 to 1.14.8 in /front
 2022-02-14 22:04:22 +01:00
Lukas Hass
ae46a1faf1
Merge branch 'develop' into vite 2022-02-14 19:47:27 +01:00
David Négrier
7a44f3dcb8
Merge pull request #1853 from anbraten/remove-external-deps 
Bundle nes.css and quill-js
 2022-02-14 18:46:19 +01:00
Hanusiak Piotr
6f41622263 unignoring resources directory 2022-02-14 16:26:50 +01:00
David Négrier
9bfce8412a Adding a missing translation for "Visiting card" 
Also, changing "Visiting Card" to "Business Card" in English
 2022-02-14 16:00:53 +01:00
Hanusiak Piotr
639c456540 use png instead of svg for talk icon 2022-02-14 10:37:13 +01:00
Anton Bracke
aef64afdb9
fix quill import 2022-02-13 20:20:38 +01:00
Lukas Hass
29cdb1a8e5
Merge branch 'develop' into vite 2022-02-13 11:46:26 +01:00
dependabot[bot]
c6b125b347
Bump follow-redirects from 1.14.7 to 1.14.8 in /front 
Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.14.7 to 1.14.8.
- [Release notes](https://github.com/follow-redirects/follow-redirects/releases)
- [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.14.7...v1.14.8)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-13 09:55:59 +00:00