Skip to content

Commit

Permalink
Merge main into stable/4.0.x. Update 20231101
Browse files Browse the repository at this point in the history
* commit 'de1c41c440e2769f30db848afed513db289c3dba':
  Add missing field to history subscription (#2915)
  Update projection-edit-dialog to fix bugs (#2891)
  Fix meeting history using wrong user repo (#2889)
  Fix conflicting amendment projection (#2887)
  Add perm check to remove from motion block (#2883)
  Change shown sequential number and add a space (#2881)
  Update global search to show marks bolder (#2879)
  Prevent add ballot if deleted users (#2873)
  Fix autoupdate request flooding after logout (#2907)
  Bump tinymce from 5.10.7 to 5.10.8 in /client (#2920)
  Add tests for the color service (#2928)
  Bump @babel/traverse from 7.21.3 to 7.23.2 in /client (#2910)
  Update angular (#2810)
  • Loading branch information
m-schieder committed Nov 1, 2023
2 parents f1e2153 + de1c41c commit f1bcdbd
Show file tree
Hide file tree
Showing 357 changed files with 12,324 additions and 9,002 deletions.
16 changes: 0 additions & 16 deletions client/.browserslistrc

This file was deleted.

4 changes: 2 additions & 2 deletions client/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion client/cli/generate-settings-defaults.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 } = {
`;
Expand Down
Loading

0 comments on commit f1bcdbd

Please sign in to comment.