1
0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2024-12-01 12:24:28 +01:00

Merge branch 'feat-update-plan-categories' of git.sleede.com:projets/fab-manager into feat-update-plan-categories

This commit is contained in:
vincent 2022-04-04 09:16:22 +02:00
commit 52849e25ad
3 changed files with 3 additions and 2 deletions

View File

@ -5,6 +5,7 @@
- Updated typescript to v4.6.3 - Updated typescript to v4.6.3
- Webpack overlay will now report eslint issues - Webpack overlay will now report eslint issues
- Linted all code according to eslint rules - Linted all code according to eslint rules
- Fix a bug: Refused to connect to 'wss://localhost:3035/ws' when using a https tunnel in development mode
## v5.3.7 2022 March 28 ## v5.3.7 2022 March 28

View File

@ -15,7 +15,7 @@ interface ManagePlanCategoryProps {
/** /**
* This component shows a button. * This component shows a button.
* When clicked, we show a modal dialog allowing to fill the parameters with a new plan-category. * When clicked, we show a modal dialog allowing to fill the parameters of a plan-category (create new or update existing).
*/ */
const ManagePlanCategoryComponent: React.FC<ManagePlanCategoryProps> = ({ category, action, onSuccess, onError }) => { const ManagePlanCategoryComponent: React.FC<ManagePlanCategoryProps> = ({ category, action, onSuccess, onError }) => {
const { t } = useTranslation('admin'); const { t } = useTranslation('admin');

View File

@ -7,7 +7,7 @@
# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy # https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
Rails.application.config.content_security_policy do |policy| # # If you are using webpack-dev-server then specify webpack-dev-server host Rails.application.config.content_security_policy do |policy| # # If you are using webpack-dev-server then specify webpack-dev-server host
policy.connect_src :self, :https, 'http://localhost:3035', 'ws://localhost:3035' if Rails.env.development? policy.connect_src :self, :https, :wss, 'http://localhost:3035', 'ws://localhost:3035' if Rails.env.development?
# policy.default_src :self, :https # policy.default_src :self, :https
# policy.font_src :self, :https, :data # policy.font_src :self, :https, :data