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.

Sign up for GitHub

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

Jump to bottom

Merge develop into staging, 16 May 2024 #1463

Merged
merged 30 commits into from
May 16, 2024
Merged

Merge develop into staging, 16 May 2024 #1463

merged 30 commits into from
May 16, 2024

Conversation

lucasmarchd01
Copy link
Contributor

No description provided.

lucasmarchd01 and others added 30 commits May 14, 2024 15:02
@lucasmarchd01
update management command for add_cantus_ultimus_links
70deda2
@lucasmarchd01
source : add exists_on_cantus_ultimus field
47bf532
@lucasmarchd01
add migration file for exists_on_cantus_ultimus
9c227fd
@dchiller
Provisionally import debug_toolbar urls iff DEBUG = True
df58dad
@lucasmarchd01
browse chants: check if source exists on cantus ultimus
df5d2c1
@lucasmarchd01
source detail: check if source exists on cantus ultimus
34b807b
@lucasmarchd01
source edit: check if source exists on cantus ultimus
0d08e30
@lucasmarchd01
Revert "update management command for add_cantus_ultimus_links"
7aae08e 
This reverts commit 70deda2.
@lucasmarchd01
source edit: change sidebar link locations
67f3e01
@lucasmarchd01
browse chants: change sidebar link locations
08141c0
@lucasmarchd01
source detail: change sidebar link locations
423dafb
@lucasmarchd01
chant detail: add link to Cantus Ultimus
8068725
@lucasmarchd01
management: add command to populate exists_on_cantus_ultimus
992aabf
@lucasmarchd01
browse chants: add check for exists_on_cantus_ultimus
c51617b
@lucasmarchd01
chant detail: update display facsimile to check exists_on_cantus_ultimus
aacd0dd
@lucasmarchd01
remove duplicate code in populate_exists_on_cantus_ultimus management…
22e2051 
… command
@dchiller
Use update rather than save in assign_chants_to_segments
3f689a6
@lucasmarchd01
chant detail view: pass exists_on_cantus_ultimus as context data
9daf828
@lucasmarchd01
browse chants: remove multiple-model traversing in template
02c2859
@lucasmarchd01
chant detail: remove multiple-model traversing in template
868a069
@lucasmarchd01
management: handle update_exists_on_cantus_ultimus function with nega…
8df9ce5 
…tive case first
@lucasmarchd01 @dchiller
Update django/cantusdb_project/main_app/views/chant.py
a31dc56 
Co-authored-by: Dylan Hillerbrand <[email protected]>
@dchiller
Extend copywrite year in footer
6d80767
@dchiller
Fix broken link to Field Descriptions on chant create page
ac0b32d
@dchiller
Source list: don't include paginator when no results
991d0cd 
This modification brings the source list template in alignment
with the chant search template in this regard.
@dchiller @ahankinson
Use now template tag in copyright footer
39b3394 
Co-authored-by: Andrew Hankinson <[email protected]>
@lucasmarchd01 @dchiller
management: remove errant return statement
7ce23c6 
Co-authored-by: Dylan Hillerbrand <[email protected]>
@lucasmarchd01
management: update response handling in populate_exists_on_cantus_ult…
130805c 
…imus_field
@lucasmarchd01
management: re-introduce return statement in exception handling
976c0a5
@lucasmarchd01
Merge pull request #1456 from lucasmarchd01/issue-1079-2
80231fd 
Display links to Cantus Ultimus where possible
@lucasmarchd01 lucasmarchd01 requested a review from dchiller May 16, 2024 15:06
@lucasmarchd01 lucasmarchd01 merged commit 94cde34 into staging May 16, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dchiller dchiller dchiller approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@lucasmarchd01 @dchiller