Merge branch 'main' into hide-action-motion-block

OpenSlides · Oct 23, 2023 · cb15a19 · cb15a19
2 parents a6f7a22 + d9c1d21
commit cb15a19
Show file tree

Hide file tree

Showing 355 changed files with 12,250 additions and 8,973 deletions.
diff --git a/client/.browserslistrc b/client/.browserslistrc
diff --git a/client/README.md b/client/README.md
@@ -77,8 +77,8 @@ OpenSlides uses the following software or parts of them:
 - [@angular-eslint/template-parser@13.1.0](https://github.com/angular-eslint/angular-eslint), License: MIT
 - [@angular/cli@13.2.4](https://github.com/angular/angular-cli), License: MIT
 - [@angular/compiler-cli@13.2.3](https://github.com/angular/angular), License: MIT
-- [@biesbjerg/ngx-translate-extract-marker@1.0.0](https://github.com/biesbjerg/ngx-translate-extract-marker), License: MIT
-- [@biesbjerg/ngx-translate-extract@7.0.4](https://github.com/biesbjerg/ngx-translate-extract), License: MIT
+- [@colsen1991/ngx-translate-extract-marker@1.0.0](https://github.com/Husbanken/ngx-translate-extract-marker), License: MIT
+- [@vendure/ngx-translate-extract@8.0.0](https://github.com/vendure-ecommerce/ngx-translate-extract), License: MIT
 - [@types/file-saver@2.0.5](https://github.com/DefinitelyTyped/DefinitelyTyped), License: MIT
 - [@types/jasmine@3.10.3](https://github.com/DefinitelyTyped/DefinitelyTyped), License: MIT
 - [@types/js-yaml@4.0.5](https://github.com/DefinitelyTyped/DefinitelyTyped), License: MIT

diff --git a/client/cli/generate-settings-defaults.ts b/client/cli/generate-settings-defaults.ts
@@ -13,7 +13,7 @@ const DESTINATION = path.resolve(path.join(__dirname, '../src/app/domain/definit
 const FILE_TEMPLATE = dedent`
     // THIS FILE IS GENERATED AUTOMATICALLY. DO NOT CHANGE IT MANUALLY.
 
-    import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker';
+    import { marker as _ } from '@colsen1991/ngx-translate-extract-marker';
 
     export const meetingSettingsDefaults: { [key: string]: any } = {
 `;