Merged
Conversation
Merge stable to develop
Merge stable to develop
Enhancing the functionality of the MSColab server to allow users to upload small images which would replace generic initials as identifiers during login. This feature personalizes user accounts and significantly enhances the visual aspect of user identification and interaction within the MSColab platform. Co-authored-by: Aryan Gupta <[email protected]>
Merge stable to develop
With this flask-migrate is used on application setup to automatically migrate the configured database to the latest revision shipped with MSColab. This will make manual migrations in production environments unnecessary in the future. Also included is an upgrade path from databases which were previously manually managed. This entails generating a new database and copying over all data.
Bumps [benc-uk/workflow-dispatch](https://github.com/benc-uk/workflow-dispatch) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/benc-uk/workflow-dispatch/releases) - [Commits](benc-uk/workflow-dispatch@v1.2.3...v1.2.4) --- updated-dependencies: - dependency-name: benc-uk/workflow-dispatch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
When inserting rows into PostgreSQL tables and explicitly setting values for e.g. auto-increment columns, like the IDs, the associated sequences aren't automatically updated. This means that without explicitly fixing the sequences PostgreSQL would try to insert new rows with existing values for the IDs, failing in the process due to unique constraints. This issue doesn't affect MariaDB nor SQLite. The former automatically updates auto-increment counters on insert, the latter simply uses the last rows ID as a starting point. This change also extends the tests to try adding a new user after the migration, which should catch this kind of issue.
Created enum types should also be dropped on downgrade. Dropping tables must be committed to become visible.
* removing pinned xmlschema (#2117) * Stop ignoring some test files (#2291) * Reconfigured tutorial videos for RTFD (#2458) * changed to videos/ * use mss style on rtfd * fix urls and text (#2460) * Bump benc-uk/workflow-dispatch from 1.2.3 to 1.2.4 (#2450) Bumps [benc-uk/workflow-dispatch](https://github.com/benc-uk/workflow-dispatch) from 1.2.3 to 1.2.4. - [Release notes](https://github.com/benc-uk/workflow-dispatch/releases) - [Commits](benc-uk/workflow-dispatch@v1.2.3...v1.2.4) --- updated-dependencies: - dependency-name: benc-uk/workflow-dispatch dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Limit video width to the containing block's width (#2463) * pinning of libtiff is not needed but blocks a more recent libxml2 and others (#2469) * fixed the model.Message description and tests now using op_id (#2470) * bug fix for incomplete xml imports (#2468) validate xml content * prepare v9.2.0 (#2481) --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Matthias Riße <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Merge stable to develop
Enhancing the functionality of the MSColab server to allow users to upload small images which would replace generic initials as identifiers during login. This feature personalizes user accounts and significantly enhances the visual aspect of user identification and interaction within the MSColab platform. This includes real-time tracking of active users per operation, enhancing the chat window, seeing who performed what changes and separating system message from user messages. --------- Co-authored-by: Aryan Gupta <[email protected]>
Show in About a new version available. --------- Co-authored-by: Matthias Riße <[email protected]>
removed the xmlsec binary selector based on CONDA_PREFIX provided separate config for msidp separate dir for mscolab server data and work asynchronously by msolab ui --------- Co-authored-by: Matthias Riße <[email protected]>
* Further refactoring to simplify control flow Fewer LOC to make things more maintanable. Also Fix #2514 * Handle Exceptions at the outer level, so no unforeseen errors occur. Also catch uncaught SocketIO-Exceptions to handle them gracefully. * better solution
Merge stable to develop
* option to enable flask debug added * remove mscolab start from batch * similiar dir as for the ui * new module for mscolab restart * linting satisfied
* join for recording * fixes #2539 * spelling
* Further refactoring of mscolab * Move (most) communication with server to ConnectionManager class to have consistent calls and error handling (e.g. timeout). * More consistently use json() method of response. * Removed single letter variables. * Update mscolab_exceptions.py update copyright string --------- Co-authored-by: ReimarBauer <[email protected]>
improved the mscolab features, replaced sys.exit by a raise SystemExit, replaced QtTest calls, renamed cli_tool back to main ---- Co-authored-by: ReimarBauer <[email protected]> Co-authored-by: Jets@ps2004 <[email protected]>
--------- Co-authored-by: anjManatech <[email protected]>
Merge stable to develop
--------- Co-authored-by: Matthias Riße <[email protected]>
Co-authored-by: Matthias Riße <[email protected]>
joernu76
approved these changes
Feb 26, 2025
matrss
approved these changes
Feb 26, 2025
Collaborator
matrss
left a comment
matrss
left a comment
There was a problem hiding this comment.
Diff between the merge result of this and the develop branch is empty, so LGTM.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Purpose of PR?:
merge develop to stable
This will become the next major release v10