-
Notifications
You must be signed in to change notification settings - Fork 6
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, 10 July #1558
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This removes the RISM Sigla table and all the places where it is referenced in the code. I have saved a local backup of the data in CSV before exporting. Running the migration will delete the table and all the data in the database. Fixes #1508 # Conflicts: # django/cantusdb_project/main_app/models/source.py
Fixed 1508 siglum 2
This PR fixes the permissions checks to allow superusers to access all the forms by default. It also does a couple maintenancey things: - Remove redundant parens from clauses - Adds a 'noqa' marker so IDEs don't flag the reverse relationships as a method not found - Removes a transitory variable assignment when the direct usage doesn't actually amount in more code or multiple uses Fixes #1527
Fixed: Allow superusers all access
- removes styling from the listBox element - changes styling on its parent, the chantsDiv element
- create a new template "base_page_with_side_cards.html" from which other templates can inherit with styling to send some sidebar cards above main page content and some below main page content on narrow windows - adjust flatpages, article pages and main_app templates to use this template - get rid of independent, media-aware main-content margins (these are now accounted for in the template)
Change custom error page location & remove htpasswd placeholder
Send portions of sidebar to top on narrow screens; fix global search bar on dynamic pages
Re-implement cantus index input tool
Remove segment field from chants and sequences Add project field to chants and sequences
The assign_sequences_to_bower_project command fills in the new project field on sequences with the Clavis Sequentiarum project. Also, creates relevant test.
- tests and mock data for get_merged_cantus_ids and get_ci_text_search functions are added. - old cantus index domain is added as a global variable
Add tests for `CISearchView` and cantus index functions
…-level Add `Project` model for chants & return segment to a source-level object
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.