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-634 Move Account Settings name field labels #2209

Merged
merged 2 commits into from
Dec 11, 2023

Conversation

rasarkar
Copy link
Collaborator

@rasarkar rasarkar marked this pull request as ready for review December 11, 2023 18:11
@jkueloc jkueloc merged commit ad6c204 into main Dec 11, 2023
3 checks passed
@rasarkar rasarkar deleted the CONCD-634-rsar-name-labels branch December 12, 2023 14:02
rasarkar added a commit that referenced this pull request Dec 18, 2023
* CONCD-634 Move Account Settings name field labels

* CONCD-634 I think that we can just reuse the label fields
jkueloc pushed a commit that referenced this pull request Dec 19, 2023
* CONCD-591 resolved merge conflicts

* 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>

* CONCD-610 numlist, bullist, link, hr (#2207)

* CONCD-634 Move Account Settings name field labels (#2209)

* CONCD-634 Move Account Settings name field labels

* CONCD-634 I think that we can just reuse the label fields

* Update status messages on transcription form when the form is updated through ajax. (#2210)

* Removal of extraneous files, and changes to staticfiles and gulp to get rid of duplicate file warnings (#2211)

* Removal of extraneous files, and changes to staticfiles and gulp to get rid of duplicate file warnings

* Turned on custom static files config

* Removed flag middleware (#2212)

* Added flags for jump to links. Changed global next trascribe/review views to use those flags. (#2213)

* CONCD-591 merge migration

* CONCD-488 re-doing a change that I accidentallly stomped

---------

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Josh Stegmaier <[email protected]>
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.

3 participants