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, 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

Commits on Jun 4, 2024

  1. 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

  2. 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

  3. 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

  4. 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. 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

  4. 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