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 staging into production, 2024-Mar-19 edition #1373

Merged
merged 46 commits into from Mar 22, 2024
Merged

Merge staging into production, 2024-Mar-19 edition #1373

merged 46 commits into from Mar 22, 2024

Conversation

jacobdgm
Copy link
Contributor

@jacobdgm jacobdgm commented Mar 19, 2024 •
edited

Pages affected:

  • all pages
    • header has been updated to switch to a hamburger menu at a narrower breakpoint
      • "Home" has been removed
      • alt and title text for logo are both now "Cantus Database Home"
      • navbar-expand breakpoint changed from xl to lg
      • under "About", a link to homepage has been added
      • to the logo and to the About>Home link, query parameters have been added to track how people are navigating to the home page
  • Chant Edit Syllabification
    • layout has been updated to match layout of other pages (mostly, there should be no more narrow margin-right on narrow breakpoints)
  • Chant List
    • view renamed to SourceBrowseChantsView
  • Sequence Detail
    • Table of concordances no longer visually spills beyond its containing div
  • Sequence Edit
    • layout has been updated to match layout of other pages (mostly, there should be no more narrow margin-right on narrow breakpoints)
  • Source Browse Chants
    • current source now automatically selected in dropdown on page load
    • When new source is selected via the dropdown, the Browse Chants page for the relevant source loads
    • Unpublished sources no longer appear listed in the dropdown when user is anonymous
  • Source Detail
    • For sources in the Bower segment, we no longer display "Select folio/feast" dropdowns
  • a number of no-longer-necessary files have been deleted:
    • differentia_data.txt
    • editors_chant.csv
    • editors_source.csv
    • error_log.txt
    • old_users_list.py
    • oldcantususer_uid_role.csv

jacobdgm and others added 30 commits February 29, 2024 21:13
@jacobdgm
base.html header: Remove subtitles
8c2e662
@jacobdgm
base.html header: Remove 'Home'
a75fa00
@jacobdgm
header logo: Tweak alt attribute and add title attribute
17ad7a8
@jacobdgm
header: adjust navbar-expand bootstrap breakpoint from xl to lg
d9620af
@jacobdgm
Delete differentia_data.txt
06edb82
@jacobdgm
Delete editors_chant.csv
0f88a09
@jacobdgm
Delete editors_source.csv
c2e7f78
@jacobdgm
Delete error_log.txt
874be2d
@jacobdgm
Delete old_users_list.py
9333f8b
@jacobdgm
Delete oldcantususer_uid_role.csv
de4798d
@jacobdgm
chant_edit_syllabification.html: Improve formatting
c01623c
@jacobdgm
Merge pull request #1352 from jacobdgm/1175-clean-up
6846ef8 
Delete unnecessary files in `cantusdb_project` directory
@jacobdgm
Merge pull request #1354 from jacobdgm/1353-syllabification-layout
48a6ee5 
chant_edit_syllabification.html: Improve formatting
@jacobdgm
Sequence Detail: Wrap concordances table in table-responsive div
81406d8
@jacobdgm
Sequence Edit: Fix formatting
0bfd4a4 
by removing errant mr-3 bootstrap class
@jacobdgm
Source Detail: Hide folio/feast dropdowns in sidebar for Bower sources
676e65c
@lucasmarchd01
chant-list.js: redirect to source chant list page when source paramet…
81c191d 
…er selected
@lucasmarchd01
chant-list: display currently selected source in dropdown
49d8f97
@lucasmarchd01
Merge branch 'develop' into issue-1336
c3c7fd1
@jacobdgm
Merge pull request #1356 from jacobdgm/1355-sequence-concordances-table
83299b6 
Sequence Detail: Wrap concordances table in table-responsive div
@jacobdgm
Merge pull request #1358 from jacobdgm/1357-sequence-edit-formatting
16b4002 
Sequence Edit: Fix formatting at narrow breakpoints
@jacobdgm
Merge pull request #1359 from jacobdgm/1049-complete-785
9074c25 
Source Detail: Hide folio/feast dropdowns in sidebar for Bower sources
@jacobdgm
Merge branch 'DDMAL:develop' into streamline-header-drastic
720cc18
@dependabot
Bump django from 4.2.10 to 4.2.11 in /django/cantusdb_project
8d6a878 
Bumps [django](https://github.com/django/django) from 4.2.10 to 4.2.11.
- [Commits](django/django@4.2.10...4.2.11)

---
updated-dependencies:
- dependency-name: django
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
@jacobdgm
Navbar: Add homepage link to 'About' dropdown
4491c0b
@jacobdgm
Navbar: Add 'ref' query parameters to links to homepage
573e43c
@jacobdgm
Navbar logo: Update alt text
656ad43
@jacobdgm
Navbar logo: Reset alt text to what it was on OldCantus
854de1c
@jacobdgm
Navbar logo: update alt text to reflect logo's use as a functional image
108ac9a
@jacobdgm
Merge pull request #1338 from jacobdgm/streamline-header-drastic
87cb792 
Streamline header (drastic option)
jacobdgm and others added 4 commits March 19, 2024 13:19
@jacobdgm
Merge pull request #1369 from DDMAL/dependabot/pip/django/cantusdb_pr…
470f328 
…oject/django-4.2.11

Bump django from 4.2.10 to 4.2.11 in /django/cantusdb_project
@jacobdgm
Merge pull request #1372 from DDMAL/develop
2c19e7a 
Merge develop into staging, 2024-Mar-19 edition
@lucasmarchd01
chant_list.js: change variable name
53aeaf0
@lucasmarchd01
Merge pull request #1362 from lucasmarchd01/issue-1336
9057bdd 
Fix "Browse Chants" page "Source" drop-down bug
@jacobdgm
Copy link
Contributor Author

On the Staging server, we're back on the staging branch proper, and these changes have been deployed. All tests are passing.

@jacobdgm
Merge pull request #1374 from DDMAL/develop
f4fdf23 
Merge develop into staging, 2024-Mar-19 bonus edition
@jacobdgm jacobdgm mentioned this pull request Mar 19, 2024
Closed
@jacobdgm jacobdgm mentioned this pull request Mar 21, 2024
Merged
@jacobdgm
Merge pull request #1385 from DDMAL/develop
f108644 
Merge develop into staging, 2024-Mar-21 edition
@jacobdgm jacobdgm merged commit 57db703 into production Mar 22, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@jacobdgm @lucasmarchd01 @dchiller