Skip to content

Commit

Permalink
Merge branch 'main' into updateTranslations20231110
Browse files Browse the repository at this point in the history
  • Loading branch information
emanuelschuetze authored Nov 13, 2023
2 parents f987bc6 + 97d9a9a commit 074dec0
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0.13
4.0.14
2 changes: 1 addition & 1 deletion openslides-client
Submodule openslides-client updated 26 files
+3 −1 client/src/app/domain/models/organizations/organization.ts
+2 −1 client/src/app/gateways/repositories/organization-repository.service.ts
+1 −1 ...t/src/app/site/pages/meetings/pages/agenda/modules/topics/modules/topic-poll/services/topic-poll.service.ts
+1 −1 ...t/src/app/site/pages/meetings/pages/assignments/modules/assignment-poll/services/assignment-poll.service.ts
+1 −1 client/src/app/site/pages/meetings/pages/assignments/pages/assignment-polls/assignment-polls.module.ts
+1 −1 ...p/site/pages/meetings/pages/motions/modules/motion-poll/services/motion-poll.service/motion-poll.service.ts
+7 −7 ...eetings/pages/motions/pages/motion-blocks/components/motion-block-detail/motion-block-detail.component.html
+1 −1 client/src/app/site/pages/meetings/pages/motions/pages/motion-polls/motion-polls.module.ts
+2 −2 ...site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.html
+4 −0 ...p/site/pages/meetings/pages/motions/pages/workflows/components/workflow-detail/workflow-detail.component.ts
+4 −4 ...tors/components/projector-edit-dialog/components/projector-edit-dialog/projector-edit-dialog.component.html
+1 −1 ...c/app/site/pages/meetings/pages/projectors/components/projector-edit-dialog/projector-edit-dialog.module.ts
+1 −1 ...nt/src/app/site/pages/meetings/services/meeting-settings-definition.service/meeting-settings-definitions.ts
+12 −2 ...ization/pages/accounts/pages/account-import/components/account-import-list/account-import-list.component.ts
+1 −1 .../organization/pages/accounts/pages/account-import/services/account-import.service/account-import.service.ts
+1 −1 client/src/app/ui/modules/import-list/components/import-list/import-list.component.ts
+34 −4 client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.html
+4 −0 client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.scss
+26 −3 client/src/app/ui/modules/import-list/components/via-backend-import-list/backend-import-list.component.ts
+3 −0 client/src/app/ui/modules/import-list/definitions/import-list-header-definition.ts
+1 −1 client/src/app/ui/modules/import-list/import-list.module.ts
+1 −1 client/src/app/ui/modules/vertical-tab-group/components/vertical-tab-group/vertical-tab-group.component.ts
+1 −1 client/src/app/ui/modules/vertical-tab-group/vertical-tab-group.module.ts
+3 −1 client/src/assets/styles/tables.scss
+5 −0 client/src/assets/styles/theme-styles.scss
+7 −1 client/src/styles.scss

0 comments on commit 074dec0

Please sign in to comment.