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

Merge develop into staging, 13 June 2024 #1523

Merged
merged 40 commits into from
Jun 13, 2024
Merged

Merge develop into staging, 13 June 2024 #1523

merged 40 commits into from
Jun 13, 2024

Conversation

dchiller
Copy link
Contributor

No description provided.

lucasmarchd01 and others added 30 commits June 4, 2024 15:54
Update manage.sh to include new path to docker executable
Fix ordering in "My Sources" page
Preserve proofreader fields for contributor changes on chants
Fixed: Add a migration for changes to Source model
 - alters the source model for storing a reference to the holding institution
 - Adds the institution identifiers models

Fixes #1505
- Moves each model admin to its own file
- Creates a shared base_admin file for the base model admin

Fixes #110
Also runs black on the files to make them fit the formatting
Fix `TypeError` in `get_suggested_chant()`
- Adds a password file to the nginx container build process
- Adds a mock password file to the repo (note: actual
password file for the staging server is provisioned by ansible
After a review of the existing institution information in Cantus, the following improvements are made

- Adds region, country, and alternate names fields for the institution
- Modifies the admin site for institutions to show the table, and to show an inline for adding identifiers
Nginx: add custom 500 page, refactor error page static files, add simple password
Request from Debra for institution records
Add GitHub action to run tests; fix erroring test for ChantEditSyllabificationView
@dchiller dchiller changed the title Merge develop into staging, 12 June 2024 Merge develop into staging, 13 June 2024 Jun 13, 2024
@dchiller dchiller merged commit 7c94d6c into staging Jun 13, 2024
1 check passed
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