Skip to content

Merging main back into development after the 4.0 release - #3228

Merged
briri merged 5 commits into
developmentfrom
main
Oct 27, 2022
Merged

Merging main back into development after the 4.0 release#3228
briri merged 5 commits into
developmentfrom
main

Conversation

@briri

@briri briri commented Oct 26, 2022

Copy link
Copy Markdown
Contributor

Just pulling in latest from main

John Pinto and others added 5 commits August 12, 2022 12:52
character combinations lik \0.. or \F.., e,g, as in
 G:\Hematologie\Onderzoek\Studie Team Hematologie\Studies op alfabet\studies\abc\00. DIGITAAL ISF\03. Contracts - Agreements\a. Clinical Trial Agreement.

Fix for issue #3203.

Change:
The htmltoword gem converts html to docx, so we clean the html string by
replacing single backslashes \ by double backslashes \\.
…hen-dowloading_plans

Bug #3203 - Fix for download plans docx being malformed if it has
Fixing seeding issue for French translation
@briri
briri requested a review from benjaminfaure October 26, 2022 22:24
@briri

briri commented Oct 26, 2022

Copy link
Copy Markdown
Contributor Author

@benjaminfaure this is just to sync development up with a few bug fixes that were in the main branch. Can you could review and then merge if all looks good?

@benjaminfaure benjaminfaure left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking good :)

@briri
briri merged commit 68e914c into development Oct 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

3 participants