Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Collab Branch Merge #660

Merged
merged 82 commits into from
May 18, 2023
Merged

Collab Branch Merge #660

merged 82 commits into from
May 18, 2023

Conversation

GeoDirk
Copy link
Contributor

@GeoDirk GeoDirk commented May 17, 2023

@gerfen

I checked all the menus and they are working as expected. Everything seems back to normal.

…t. Instead use IModelBuilder info during deserialization. Changed serialized format of Alignments (group into book+chapter files, added alignment set contextual info)
…zation have format consistent with alignment
…pora, fixed various merge bugs and improved speed
…u option implementations to CollaborationTests
Christopher Morley and others added 23 commits April 26, 2023 09:03
…t db) for testing; fixed association only being created for first composite token; fixed custom versification; added shared text fixture
…or attempted merge breaking initialize from server; code to avoid creating multiple copies of manuscript corpora/tokenized corpora
…composite tokens; collab refactoring and bug fixes
… WindowTabLayout is already ignored); added UI Refresh event
@GeoDirk GeoDirk requested a review from gerfen May 17, 2023 13:37
@gerfen gerfen merged commit 2b80987 into main May 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants