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.

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 pals features in to main #2138

Merged
merged 24 commits into from
Jan 10, 2024
Merged

Merge pals features in to main #2138

merged 24 commits into from
Jan 10, 2024

Commits on Dec 19, 2023

  1. Configuration menu
    Copy the full SHA
    6a1e0c5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    6f9b88b View commit details
    Browse the repository at this point in the history
  3. Updating translations

    jeremyf committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    0166692 View commit details
    Browse the repository at this point in the history
  4. 🎁 Contribute back work from PALNI/PALCI

    Related to Issues:
    
    - #1815
    - scientist-softserv/palni-palci#951
    
    Related to Pull Requests:
    
    - scientist-softserv/palni-palci#952
    jeremyf committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    d2649f9 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Merge branch 'pals-contribute-back-to-prime' into merge-main-into-pals

    * pals-contribute-back-to-prime:
      🎁 Contribute back work from PALNI/PALCI
      Updating translations
      🎁 Contributions from PALNI/PALCI
      🎁 Contributions from PALNI/PALCI
    jeremyf committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    045aa3a View commit details
    Browse the repository at this point in the history
  2. ♻️ Account for observed customizations

    Dear reviewer, put on your reading glasses.
    
    This commit looks at the newly refactored
    `Hyrax::IiifAv::DisplaysContentDecorator` as well as the current state
    of [PALS's Hyrax::IiifAv::DisplaysContentDecorator][1] and attempts to
    account for the variances between the two by introducing configurations.
    
    Yes, we could port this to the hyrax-iiif_av gem, but for now that would
    not solve the underlying issue of how we've been handling things.
    
    Why the Hyku::Application class attribute?  Because the decorator is
    being mixed into a module, which does not response to `.class_attribute`
    methods.
    
    [1]: https://github.com/scientist-softserv/palni-palci/blob/8754556c0225ce9f04674c1ffac6403586fd65f4/app/presenters/concerns/hyrax/iiif_av/displays_content_decorator.rb
    jeremyf committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    27cb0a9 View commit details
    Browse the repository at this point in the history
  3. 🧹 Appeasing Rubocop

    jeremyf committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    99a9733 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c7bbda6 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    747601f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    821cbf2 View commit details
    Browse the repository at this point in the history
  7. Removing unneeded file

    jeremyf committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    a559908 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    f2c6b89 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    b2334fa View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    0fbde50 View commit details
    Browse the repository at this point in the history
  11. 🐛 Use non-deprecated and non-removed method

    The `member_presenters_for` was removed in
    samvera/hyrax@eeb3c3e;
    the deprecation advice prior to removal was to use `member_presenters`
    
    Related to:
    
    - samvera/hyrax#6203
    jeremyf committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    5894b93 View commit details
    Browse the repository at this point in the history
  12. Fixing roles service

    jeremyf committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    6b17b5c View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    ad0d56b View commit details
    Browse the repository at this point in the history
  14. Configuration menu
    Copy the full SHA
    577a49d View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2024

  1. 🐛 Restore translation

    The translation should be plural
    jeremyf committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    b8d7a2e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    b6f85d2 View commit details
    Browse the repository at this point in the history
  3. 🧹 Revisiting translations

    jeremyf committed Jan 9, 2024
    Configuration menu
    Copy the full SHA
    a880b50 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    2879a36 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. Add missing logo translation

    jeremyf committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    6b7ba4b View commit details
    Browse the repository at this point in the history
  2. Merge branch 'main' into merge-main-into-pals

    * main:
      Revert "knapsack gemfile additions or replacement"
      ♻️ Updating Gemfile to reflect pointing to main
      knapsack gemfile additions or replacement
    jeremyf committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    1a02896 View commit details
    Browse the repository at this point in the history