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 #1500

Merged
merged 139 commits into from
Jul 15, 2024
Merged

Merge staging into production #1500

merged 139 commits into from
Jul 15, 2024

Commits on May 16, 2024

  1. dependencies: upgrade django-debug-toolbar

    @lucasmarchd01
    lucasmarchd01 committed May 16, 2024
    Configuration menu
    Copy the full SHA
    e0f51f4 View commit details
    Browse the repository at this point in the history

  2. settings.py: add docker internal IP for django debug toolbar

    @lucasmarchd01
    lucasmarchd01 committed May 16, 2024
    Configuration menu
    Copy the full SHA
    97df2c5 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2024

  1. settings: add show toolbar callback to debug toolbar config

    @lucasmarchd01
    lucasmarchd01 committed May 21, 2024
    Configuration menu
    Copy the full SHA
    4f29e56 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1464 from lucasmarchd01/issue-1457 

    Fix django debug toolbar
    @lucasmarchd01
    lucasmarchd01 authored May 21, 2024
    Configuration menu
    Copy the full SHA
    5bbbc1c View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. cantusindex.py: add get_merged_chants

    @lucasmarchd01
    lucasmarchd01 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    b9d9aed View commit details
    Browse the repository at this point in the history

  2. forms: change help text for Source title field

    @lucasmarchd01
    lucasmarchd01 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    6d4e502 View commit details
    Browse the repository at this point in the history

  3. source: change help text for title field

    @lucasmarchd01
    lucasmarchd01 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    1707f76 View commit details
    Browse the repository at this point in the history

  4. templates: replace instances of "manuscript" with "source"

    @lucasmarchd01
    lucasmarchd01 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    48602bc View commit details
    Browse the repository at this point in the history

  5. my sources sidebar: order sources by "date_updated"

    @lucasmarchd01
    lucasmarchd01 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    5504f98 View commit details
    Browse the repository at this point in the history

  6. my sources: order sources by "date_updated"

    @lucasmarchd01
    lucasmarchd01 committed May 22, 2024
    Configuration menu
    Copy the full SHA
    032bb3b View commit details
    Browse the repository at this point in the history

Commits on May 23, 2024

  1. Add Benedicamus Domino-related fields to base_chant model

    @dchiller
    dchiller committed May 23, 2024
    Configuration menu
    Copy the full SHA
    0e1945d View commit details
    Browse the repository at this point in the history

  2. Update ChantCreate and ChantEdit forms and widgets for BD fields

    @dchiller
    dchiller committed May 23, 2024
    Configuration menu
    Copy the full SHA
    68c1294 View commit details
    Browse the repository at this point in the history

  3. Add BD fields to chant_create template

    @dchiller
    dchiller committed May 23, 2024
    Configuration menu
    Copy the full SHA
    c927f77 View commit details
    Browse the repository at this point in the history

  4. Add BD fields to chant_edit template

    @dchiller
    dchiller committed May 23, 2024
    Configuration menu
    Copy the full SHA
    d837f5c View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1470 from lucasmarchd01/issue-1097-2 

    Replace instances of "Manuscript" with "Source"
    @lucasmarchd01
    lucasmarchd01 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    e6518b0 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1472 from lucasmarchd01/issue-1468 

    Reorder sources by `date_updated` on My Sources page and sidebar
    @lucasmarchd01
    lucasmarchd01 authored May 23, 2024
    Configuration menu
    Copy the full SHA
    00848ce View commit details
    Browse the repository at this point in the history

  7. Remove unnecessary comments in forms.py

    @dchiller
    dchiller committed May 23, 2024
    Configuration menu
    Copy the full SHA
    dd53bf9 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1473 from dchiller/add-bd-fields 

    Update Chant model and related forms for Benedicamus Domino-specific fields
    @dchiller
    dchiller authored May 23, 2024
    Configuration menu
    Copy the full SHA
    c3775c6 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #1475 from DDMAL/develop 

    Merge develop into staging, 23 May 2024
    @dchiller
    dchiller authored May 23, 2024
    Configuration menu
    Copy the full SHA
    99cb751 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2024

  1. cantusindex: add get_merged_cantus_ids

    @lucasmarchd01
    lucasmarchd01 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    f11bf8d View commit details
    Browse the repository at this point in the history

  2. management: add_cantus_index_merge_events command for cron job

    @lucasmarchd01
    lucasmarchd01 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    b0c20f5 View commit details
    Browse the repository at this point in the history

  3. update docstring

    @lucasmarchd01
    lucasmarchd01 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    95810ff View commit details
    Browse the repository at this point in the history

  4. remove unused import

    @lucasmarchd01
    lucasmarchd01 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    26dfdcb View commit details
    Browse the repository at this point in the history

  5. fix spacing

    @lucasmarchd01
    lucasmarchd01 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    c38ce8a View commit details
    Browse the repository at this point in the history

  6. management: remove unused import

    @lucasmarchd01
    lucasmarchd01 committed May 24, 2024
    Configuration menu
    Copy the full SHA
    aaa8e7d View commit details
    Browse the repository at this point in the history

Commits on May 27, 2024

  1. management: fix typing for date filter

    @lucasmarchd01
    lucasmarchd01 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    c565828 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1479 from lucasmarchd01/issue-877 

    Add Management Command to Reflect Cantus ID Merge Events on CI to CD
    @lucasmarchd01
    lucasmarchd01 authored May 27, 2024
    Configuration menu
    Copy the full SHA
    c2ab71b View commit details
    Browse the repository at this point in the history

  3. source list: add .distinct() to queryset

    @lucasmarchd01
    lucasmarchd01 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    8bfbbe2 View commit details
    Browse the repository at this point in the history

  4. static: add footer logos

    @lucasmarchd01
    lucasmarchd01 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    2baca6a View commit details
    Browse the repository at this point in the history

  5. static: delete unused logos

    @lucasmarchd01
    lucasmarchd01 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    9b17a33 View commit details
    Browse the repository at this point in the history

  6. base: add footer logos and adjust styling

    @lucasmarchd01
    lucasmarchd01 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    1604db1 View commit details
    Browse the repository at this point in the history

  7. base: change "Cantus Team" list

    @lucasmarchd01
    lucasmarchd01 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    2937416 View commit details
    Browse the repository at this point in the history

  8. static: add creative commons logo to footer

    @lucasmarchd01
    lucasmarchd01 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    bcfccb8 View commit details
    Browse the repository at this point in the history

  9. static: remove cantus database logo

    @lucasmarchd01
    lucasmarchd01 committed May 27, 2024
    Configuration menu
    Copy the full SHA
    56ce8f5 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2024

  1. Merge pull request #1481 from lucasmarchd01/issue-1480 

    Fix duplicate results in source search
    @lucasmarchd01
    lucasmarchd01 authored May 28, 2024
    Configuration menu
    Copy the full SHA
    69a7dae View commit details
    Browse the repository at this point in the history

  2. static: remove neh logo from footer

    @lucasmarchd01
    lucasmarchd01 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    f316f85 View commit details
    Browse the repository at this point in the history

  3. footer: Change development and maintenance link

    @lucasmarchd01
    lucasmarchd01 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    f122d91 View commit details
    Browse the repository at this point in the history

  4. footer: remove errant spaces

    @lucasmarchd01
    lucasmarchd01 committed May 28, 2024
    Configuration menu
    Copy the full SHA
    5fb051c View commit details
    Browse the repository at this point in the history

Commits on May 29, 2024

  1. footer: Change "DDMAL" to "DDMAL Lab"

    @lucasmarchd01
    lucasmarchd01 committed May 29, 2024
    Configuration menu
    Copy the full SHA
    c030b9b View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1482 from lucasmarchd01/issue-1405 

    Update footer logos
    @lucasmarchd01
    lucasmarchd01 authored May 29, 2024
    Configuration menu
    Copy the full SHA
    fcf31af View commit details
    Browse the repository at this point in the history

  3. Upgrade to volpiano-display-utilities 1.1.3

    @dchiller
    dchiller committed May 29, 2024
    Configuration menu
    Copy the full SHA
    e1379ce View commit details
    Browse the repository at this point in the history

  4. Use safe template filter for source.indexing_notes in sidebar

    @dchiller
    dchiller committed May 29, 2024
    Configuration menu
    Copy the full SHA
    f8146b8 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2024

  1. Update container name in db_backup.sh

    @dchiller
    dchiller committed May 30, 2024
    Configuration menu
    Copy the full SHA
    7c84fc7 View commit details
    Browse the repository at this point in the history

  2. Specify container names in docker-compose files

    @dchiller
    dchiller committed May 30, 2024
    Configuration menu
    Copy the full SHA
    f2318bf View commit details
    Browse the repository at this point in the history

  3. Change docker-compose to docker compose in cron/management/manage.sh

    @dchiller
    dchiller committed May 30, 2024
    Configuration menu
    Copy the full SHA
    07db05e View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1487 from dchiller/upgrade-volpiano-display-utili… 

    …ties

Upgrade to volpiano-display-utilities 1.1.3
    @dchiller
    dchiller authored May 30, 2024
    Configuration menu
    Copy the full SHA
    d8a8271 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1488 from dchiller/i1486-inventory-notes 

    Use safe template filter for source.indexing_notes in sidebar
    @dchiller
    dchiller authored May 30, 2024
    Configuration menu
    Copy the full SHA
    2752216 View commit details
    Browse the repository at this point in the history

  6. build(deps): bump requests from 2.31.0 to 2.32.2 

    Bumps [requests](https://github.com/psf/requests) from 2.31.0 to 2.32.2.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.31.0...v2.32.2)

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

Signed-off-by: dependabot[bot] <[email protected]>
    @dependabot
    dependabot[bot] authored May 30, 2024
    Configuration menu
    Copy the full SHA
    a50dc82 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1490 from dchiller/i1489-fix-backup-cron 

    Fix cron script issues related to docker version upgrade on new servers
    @dchiller
    dchiller authored May 30, 2024
    Configuration menu
    Copy the full SHA
    e0b5a97 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2024

  1. chant search: allow sortable headers from global search bar

    @lucasmarchd01
    lucasmarchd01 committed May 31, 2024
    Configuration menu
    Copy the full SHA
    0f11464 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2024

  1. tests: add tests for chant search using global search bar

    @lucasmarchd01
    lucasmarchd01 committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    ed6073a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1497 from lucasmarchd01/issue-1089 

    Fix sort headers on chant search page when using global search bar
    @lucasmarchd01
    lucasmarchd01 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    490ce55 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1494 from DDMAL/dependabot/pip/requests-2.32.2 

    build(deps): bump requests from 2.31.0 to 2.32.2
    @lucasmarchd01
    lucasmarchd01 authored Jun 3, 2024
    Configuration menu
    Copy the full SHA
    908f29e View commit details
    Browse the repository at this point in the history

  4. Assign sequences to segment in command

    @dchiller
    dchiller committed Jun 3, 2024
    Configuration menu
    Copy the full SHA
    781387e View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2024

  1. Merge pull request #1499 from dchiller/assign-sequences-to-segments-too 

    Assign sequences to segment in `assign_chants_to_segments` command
    @dchiller
    dchiller authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    d21f42c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1498 from DDMAL/develop 

    Merge develop into staging, 3 Jun 2024
    @dchiller
    dchiller authored Jun 4, 2024
    Configuration menu
    Copy the full SHA
    668dd22 View commit details
    Browse the repository at this point in the history

  3. chant edit: preserve proofreader fields for contributor changes

    @lucasmarchd01
    lucasmarchd01 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    3a1c328 View commit details
    Browse the repository at this point in the history

  4. chant edit: edit typing

    @lucasmarchd01
    lucasmarchd01 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    ea46ca4 View commit details
    Browse the repository at this point in the history

  5. chant edit: change chant object retrieval

    @lucasmarchd01
    lucasmarchd01 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    3b3391d View commit details
    Browse the repository at this point in the history

  6. chant view: remove unused import

    @lucasmarchd01
    lucasmarchd01 committed Jun 4, 2024
    Configuration menu
    Copy the full SHA
    9c64810 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2024

  1. Update manage.sh

    @dchiller
    dchiller authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    fda5cc0 View commit details
    Browse the repository at this point in the history

  2. edit chant: add typing for user

    @lucasmarchd01
    lucasmarchd01 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    ef589de View commit details
    Browse the repository at this point in the history

  3. my sources: fix ordering of sources in list and sidebar

    @lucasmarchd01
    lucasmarchd01 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    38fbd3c View commit details
    Browse the repository at this point in the history

  4. tests: black formatting

    @lucasmarchd01
    lucasmarchd01 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    4f3311d View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1503 from DDMAL/i1502-manage-docker-path 

    Update manage.sh to include new path to docker executable
    @dchiller
    dchiller authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    7dc3d2e View commit details
    Browse the repository at this point in the history

  6. Merge pull request #1504 from lucasmarchd01/issue-1468-2 

    Fix ordering in "My Sources" page
    @lucasmarchd01
    lucasmarchd01 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    94fba8c View commit details
    Browse the repository at this point in the history

  7. chant edit: simplify with set() method

    @lucasmarchd01
    lucasmarchd01 committed Jun 5, 2024
    Configuration menu
    Copy the full SHA
    3dbbf0b View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1501 from lucasmarchd01/issue-1491 

    Preserve proofreader fields for contributor changes on chants
    @lucasmarchd01
    lucasmarchd01 authored Jun 5, 2024
    Configuration menu
    Copy the full SHA
    1f70a5d View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2024

  1. Fixed: Add a migration for changes to Source model 

    Fixes #1511
    @ahankinson
    ahankinson committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    228eb45 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1512 from DDMAL/fixed-1511-add-missing-migration 

    Fixed: Add a migration for changes to Source model
    @lucasmarchd01
    lucasmarchd01 authored Jun 6, 2024
    Configuration menu
    Copy the full SHA
    914fbf3 View commit details
    Browse the repository at this point in the history

  3. Fixed: Add institution models 

     - alters the source model for storing a reference to the holding institution
 - Adds the institution identifiers models

Fixes #1505
    @ahankinson
    ahankinson committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    bea8ded View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into fixed-1505-institutions

    @ahankinson
    ahankinson committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    49146a3 View commit details
    Browse the repository at this point in the history

  5. Fixed: Break up admin.py 

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

Fixes #110
    @ahankinson
    ahankinson committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    f9c0994 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'fixed-1510-admin' into fixed-1505-institutions

    @ahankinson
    ahankinson committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    ae46096 View commit details
    Browse the repository at this point in the history

  7. Fixed: Add institutions to the new admin layout 

    Also runs black on the files to make them fit the formatting
    @ahankinson
    ahankinson committed Jun 6, 2024
    Configuration menu
    Copy the full SHA
    4462359 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2024

  1. cantusindex: fix TypeError in get_suggested_chant

    @lucasmarchd01
    lucasmarchd01 committed Jun 7, 2024
    Configuration menu
    Copy the full SHA
    4546291 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1517 from lucasmarchd01/issue-1515 

    Fix `TypeError` in `get_suggested_chant()`
    @lucasmarchd01
    lucasmarchd01 authored Jun 7, 2024
    Configuration menu
    Copy the full SHA
    6638001 View commit details
    Browse the repository at this point in the history

Commits on Jun 11, 2024

  1. Merge pull request #1513 from DDMAL/fixed-1510-admin 

    Fixed: Break up admin.py
    @dchiller
    dchiller authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    5bc4114 View commit details
    Browse the repository at this point in the history

  2. refactor(nginx): Consolidate static files for custom error pages

    @dchiller
    dchiller committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    e3a6279 View commit details
    Browse the repository at this point in the history

  3. feat(nginx): Add custom 500 error page

    @dchiller
    dchiller committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    b11f202 View commit details
    Browse the repository at this point in the history

  4. build(nginx): Add nginx password file 

    - 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
    @dchiller
    dchiller committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    62f418b View commit details
    Browse the repository at this point in the history

  5. style(nginx): Add missing space to cantusdb.conf.development

    @dchiller
    dchiller authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    76ee930 View commit details
    Browse the repository at this point in the history

  6. Fixed: Expand institution model 

    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
    @ahankinson
    ahankinson committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    75cf156 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into fixed-1505-institutions

    @ahankinson
    ahankinson committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    98b9c58 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #1520 from dchiller/nginx-password-and-error-page 

    Nginx: add custom 500 page, refactor error page static files, add simple password
    @dchiller
    dchiller authored Jun 11, 2024
    Configuration menu
    Copy the full SHA
    efae0ea View commit details
    Browse the repository at this point in the history

  9. Add former sigla to institution records 

    Request from Debra for institution records
    @ahankinson
    ahankinson committed Jun 11, 2024
    Configuration menu
    Copy the full SHA
    5d9998b View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2024

  1. Comment out chant segment and BD-specific fields on chant forms

    @dchiller
    dchiller committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    7734cde View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1522 from dchiller/i1521-remove-segment-from-chan… 

    …t-edit-create

Comment out chant segment and BD-specific fields on chant forms
    @dchiller
    dchiller authored Jun 12, 2024
    Configuration menu
    Copy the full SHA
    2050973 View commit details
    Browse the repository at this point in the history

  3. Enhance the display of the institution identifiers

    @ahankinson
    ahankinson committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    4ac2d91 View commit details
    Browse the repository at this point in the history

  4. build: use specific version of psycopg-binary package

    @dchiller
    dchiller committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    1d961f6 View commit details
    Browse the repository at this point in the history

  5. fix: Account for bad alignment flag in EditSyllabificationView 

    This flag was introduced in v1.1.0 of volpiano-display-utilities
    @dchiller
    dchiller committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    3c270d8 View commit details
    Browse the repository at this point in the history

  6. feat: Add github actions for django tests

    @dchiller
    dchiller committed Jun 12, 2024
    Configuration menu
    Copy the full SHA
    226cb5b View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2024

  1. Adjust string formatting

    @ahankinson
    ahankinson committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    5605ba6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into fixed-1505-institutions

    @ahankinson
    ahankinson committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    2d213fd View commit details
    Browse the repository at this point in the history

  3. Fixed: Remove the RISM Sigla table 

    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
    @ahankinson
    ahankinson committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    bd22850 View commit details
    Browse the repository at this point in the history

  4. feat(cantusindex): add json-text api function

    @lucasmarchd01
    lucasmarchd01 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4f1046d View commit details
    Browse the repository at this point in the history

  5. feat(urls): add cantus index input tool

    @lucasmarchd01
    lucasmarchd01 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    8992874 View commit details
    Browse the repository at this point in the history

  6. feat(chant create): add input tool card on sidebar

    @lucasmarchd01
    lucasmarchd01 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    bc9b1ec View commit details
    Browse the repository at this point in the history

  7. feat(ci search): add input tool search window page

    @lucasmarchd01
    lucasmarchd01 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    e9c62e9 View commit details
    Browse the repository at this point in the history

  8. feat(cisearchview): add ci search view

    @lucasmarchd01
    lucasmarchd01 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4b6e357 View commit details
    Browse the repository at this point in the history

  9. fix(cantusindex): fix typing and bug with json parsing

    @lucasmarchd01
    lucasmarchd01 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    f4a0a0c View commit details
    Browse the repository at this point in the history

  10. fix(cantusindex): fix error handling

    @lucasmarchd01
    lucasmarchd01 committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    d673f50 View commit details
    Browse the repository at this point in the history

  11. Merge pull request #1514 from DDMAL/fixed-1505-institutions 

    Add institutions model
    @dchiller
    dchiller authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    4c92016 View commit details
    Browse the repository at this point in the history

  12. Merge pull request #1526 from dchiller/add-test-runner 

    Add GitHub action to run tests; fix erroring test for ChantEditSyllabificationView
    @dchiller
    dchiller authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    6266757 View commit details
    Browse the repository at this point in the history

  13. Merge pull request #1523 from DDMAL/develop 

    Merge develop into staging, 13 June 2024
    @dchiller
    dchiller authored Jun 13, 2024
    Configuration menu
    Copy the full SHA
    7c94d6c View commit details
    Browse the repository at this point in the history

  14. Merge branch 'develop' into fixed-1508-siglum-2

    @dchiller
    dchiller committed Jun 13, 2024
    Configuration menu
    Copy the full SHA
    e48c6c3 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2024

  1. refactor(nginx): change location of custom error pages

    @dchiller
    dchiller committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    96f5a7f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1529 from DDMAL/fixed-1508-siglum-2 

    Fixed 1508 siglum 2
    @ahankinson
    ahankinson authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    c987e1c View commit details
    Browse the repository at this point in the history

  3. Fixed: Allow superusers all access 

    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
    @ahankinson
    ahankinson committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    ea9a0f2 View commit details
    Browse the repository at this point in the history

  4. fix(nginx): remove placeholder .htpasswd file

    @dchiller
    dchiller committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    2c4fb30 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1531 from DDMAL/fixed-1527-permissions 

    Fixed: Allow superusers all access
    @dchiller
    dchiller authored Jun 14, 2024
    Configuration menu
    Copy the full SHA
    e50b82f View commit details
    Browse the repository at this point in the history

  6. fix(search bar): show search bar dynamic results on all pages 

    - removes styling from the listBox element
- changes styling on its parent, the chantsDiv element
    @dchiller
    dchiller committed Jun 14, 2024
    Configuration menu
    Copy the full SHA
    5cee181 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2024

  1. feat(cantusindex): add genre dal selector

    @lucasmarchd01
    lucasmarchd01 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    d5de832 View commit details
    Browse the repository at this point in the history

  2. fix(cantusindex): fix genre dal option selector on cantus index tool

    @lucasmarchd01
    lucasmarchd01 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    050a951 View commit details
    Browse the repository at this point in the history

  3. refactor(cantusindex): rewrite docstrings and remove errant code

    @lucasmarchd01
    lucasmarchd01 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    971a744 View commit details
    Browse the repository at this point in the history

  4. refactor(cantusindex): remove comment

    @lucasmarchd01
    lucasmarchd01 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    f7755c2 View commit details
    Browse the repository at this point in the history

  5. feat(frontend): sandwich main content with sidebar on narrow screens 

    - 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)
    @dchiller
    dchiller committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    58f6563 View commit details
    Browse the repository at this point in the history

  6. refactor(cantusindex): add comment for dal option selector

    @lucasmarchd01
    lucasmarchd01 committed Jun 17, 2024
    Configuration menu
    Copy the full SHA
    676268d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #1530 from dchiller/refactor-error-pgs-and-psswd 

    Change custom error page location & remove htpasswd placeholder
    @dchiller
    dchiller authored Jun 17, 2024
    Configuration menu
    Copy the full SHA
    94e6c57 View commit details
    Browse the repository at this point in the history

Commits on Jun 18, 2024

  1. fix(cantusindex): fix typing in CISearchView

    @lucasmarchd01
    lucasmarchd01 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    71823a6 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #1537 from dchiller/modify-sidebar 

    Send portions of sidebar to top on narrow screens; fix global search bar on dynamic pages
    @dchiller
    dchiller authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    bcc3b21 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into issue-1391

    @lucasmarchd01
    lucasmarchd01 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    7283630 View commit details
    Browse the repository at this point in the history

  4. refactor(cantusindex): modify message on ci search

    @lucasmarchd01
    lucasmarchd01 committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    1b803aa View commit details
    Browse the repository at this point in the history

  5. Merge pull request #1538 from lucasmarchd01/issue-1391 

    Re-implement cantus index input tool
    @lucasmarchd01
    lucasmarchd01 authored Jun 18, 2024
    Configuration menu
    Copy the full SHA
    6da51fa View commit details
    Browse the repository at this point in the history

  6. feat!(models): add Project model 

    Remove segment field from chants and sequences
Add project field to chants and sequences
    @dchiller
    dchiller committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    2dfc484 View commit details
    Browse the repository at this point in the history

  7. feat(commands): Create assign_sequences_to_bower_project command 

    The assign_sequences_to_bower_project command fills in the new project
field on sequences with the Clavis Sequentiarum project.

Also, creates relevant test.
    @dchiller
    dchiller committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    0ea4430 View commit details
    Browse the repository at this point in the history

  8. fix(templates): fix spelling of Clavis Sequentiarum in dropdown 

    Refs #1544
    @dchiller
    dchiller committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    1216a2d View commit details
    Browse the repository at this point in the history

  9. feat(models): Add Project model admin

    @dchiller
    dchiller committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    64de5bc View commit details
    Browse the repository at this point in the history

  10. feat(chant-create;chant-edit): Add project field and benedicamus domi… 

    …no fields
    @dchiller
    dchiller committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    8084cfa View commit details
    Browse the repository at this point in the history

  11. fix(tests): Add Project to make_fake_chant

    @dchiller
    dchiller committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    6807731 View commit details
    Browse the repository at this point in the history

  12. fix(tests): Remove segment from Chant view tests

    @dchiller
    dchiller committed Jun 18, 2024
    Configuration menu
    Copy the full SHA
    8361d23 View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2024

  1. test(cantusindex): add missing tests 

    - 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
    @lucasmarchd01
    lucasmarchd01 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    017a67f View commit details
    Browse the repository at this point in the history

  2. test(cantusindex): add tests for CISearchView

    @lucasmarchd01
    lucasmarchd01 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    8ec1be5 View commit details
    Browse the repository at this point in the history

  3. fix(cantusindex): convert zip iterator to list in CISearchView context

    @lucasmarchd01
    lucasmarchd01 committed Jun 20, 2024
    Configuration menu
    Copy the full SHA
    da68ff5 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2024

  1. Merge pull request #1552 from lucasmarchd01/issue-1391 

    Add tests for `CISearchView` and cantus index functions
    @lucasmarchd01
    lucasmarchd01 authored Jun 21, 2024
    Configuration menu
    Copy the full SHA
    653bf52 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2024

  1. fix(forms): Make chant project field optional

    @dchiller
    dchiller committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    b9c594c View commit details
    Browse the repository at this point in the history

  2. refactor: Remove unused import in widgets.py

    @dchiller
    dchiller committed Jul 10, 2024
    Configuration menu
    Copy the full SHA
    97c7bd7 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1548 from dchiller/i1541-return-segment-to-source… 

    …-level

Add `Project` model for chants & return segment to a source-level object
    @dchiller
    dchiller authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    f17e934 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #1558 from DDMAL/develop 

    Merge develop into staging, 10 July
    @dchiller
    dchiller authored Jul 10, 2024
    Configuration menu
    Copy the full SHA
    dfb226f View commit details
    Browse the repository at this point in the history