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

Concd 617 jstegmaier service letter #2201

Merged
merged 2 commits into from
Nov 27, 2023
Merged

Conversation

joshuastegmaier
Copy link
Collaborator

Merging in hotfix.

The jump to transcription campaign hotfix was not previously merged into main, so it is included here as well.

@joshuastegmaier joshuastegmaier marked this pull request as ready for review November 27, 2023 12:48
@jkueloc jkueloc merged commit dbe5f8d into main Nov 27, 2023
3 checks passed
rasarkar pushed a commit that referenced this pull request Dec 4, 2023
* Updated transcription campaign (#2192)

* Fixed username not being included in service letter
jkueloc added a commit that referenced this pull request Dec 4, 2023
* Updated transcription campaign (#2191)

* add ECR step for dedicated tagging (#2198)

* CONCD-610 Use Rich Text editor to Django admin (#2200)

* CONCD-610 Use Rich Text editor (WiP)

* CONCD-530 set header on all responses that do not already have it

* CONCD-610 just replace codemirror

* CONCD-610 updated Pipfile.lock

* Concd 617 jstegmaier service letter (#2201)

* Updated transcription campaign (#2192)

* Fixed username not being included in service letter

* Eliminated all known uses of naive datetimes (#2202)

* Added support other languages in the OCR backend and the ability to set a list of allowed languages (#2203)

* Added support other languages in the OCR backend and the ability to set a list of allowed languages

* Fixed debug code being included

* Bump cryptography from 41.0.5 to 41.0.6 (#2204)

Bumps [cryptography](https://github.com/pyca/cryptography) from 41.0.5 to 41.0.6.
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](pyca/cryptography@41.0.5...41.0.6)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* hotfix specific deployment workflow (#2205)

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: Josh Stegmaier <[email protected]>
Co-authored-by: Jennifer Kuenning <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@joshuastegmaier joshuastegmaier deleted the CONCD-617-jstegmaier-service-letter branch December 19, 2023 14:37
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.

2 participants