Code

Merge main into i35#2153

Code

Merged

jeremyf merged 51 commits intoi35-valkyrize-hykusamvera/hyku:i35-valkyrize-hykufrom merge-main-into-i35samvera/hyku:merge-main-into-i35Copy head branch name to clipboardJan 11, 2024

+3,500-559

Commits

Commits on Dec 19, 2023

• 🎁 Contributions from PALNI/PALCI

  Show description for 6a1e0c5
  

  2 peopleauthored and

  jeremyf

  committed
  6a1e0c5

  Copy full SHA for 6a1e0c5

• 🎁 Contributions from PALNI/PALCI

  Show description for 6f9b88b
  

  5 peoplecommitted
  6f9b88b

  Copy full SHA for 6f9b88b

• Updating translations

  jeremyf

  committed
  0166692

  Copy full SHA for 0166692

• 🎁 Contribute back work from PALNI/PALCI

  Show description for d2649f9
  jeremyf

  committed
  d2649f9

  Copy full SHA for d2649f9

Commits on Jan 5, 2024

• 🎁 Hyrax 5 upgrade (#2047)

  Show description for 17c9192
  

  7 peopleauthored
  17c9192

  Copy full SHA for 17c9192

• 🤖 Update charts for deploy

  kirkkwang

  committed
  929565b

  Copy full SHA for 929565b

Commits on Jan 8, 2024

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

  Show description for 045aa3a
  jeremyf

  committed
  045aa3a

  Copy full SHA for 045aa3a

• ♻️ Account for observed customizations

  Show description for 27cb0a9
  jeremyf

  committed
  27cb0a9

  Copy full SHA for 27cb0a9

• 🧹 Appeasing Rubocop

  jeremyf

  committed
  99a9733

  Copy full SHA for 99a9733

• Remove conflict in controller

  jeremyf

  committed
  c7bbda6

  Copy full SHA for c7bbda6

• knapsack gemfile additions or replacement

  orangewolf

  committed
  9cfca93

  Copy full SHA for 9cfca93

• 🐛 Add tests for all defined color methods

  jeremyf

  committed
  747601f

  Copy full SHA for 747601f

• 🐛 Add placement_class for masthead rendering

  Show description for 821cbf2
  jeremyf

  committed
  821cbf2

  Copy full SHA for 821cbf2

• 🎁 fixes to unblock deploys

  Show description for 66d5292
  

  Shana Moore

  committed
  66d5292

  Copy full SHA for 66d5292

• Removing unneeded file

  jeremyf

  committed
  a559908

  Copy full SHA for a559908

• Resolving menu structure for site configuration

  jeremyf

  committed
  f2c6b89

  Copy full SHA for f2c6b89

• Merge branch 'update-deploy-for-hyrax-5-upgrade' into i78-deploy-hyrax-5-upgrade

  

  Shana Moore

  committed
  bcf2547

  Copy full SHA for bcf2547

• Applying changes in main to this work

  jeremyf

  committed
  b2334fa

  Copy full SHA for b2334fa

• update version to 6.0.0rc1 (#2137)

  

  Shana Moore

  authored
  ead1017

  Copy full SHA for ead1017

• Merge branch 'main' into update-deploy-for-hyrax-5-upgrade

  

  Shana Moore

  authored
  962b916

  Copy full SHA for 962b916

• Merge branch 'main' into i78-deploy-hyrax-5-upgrade

  

  Shana Moore

  authored
  5371470

  Copy full SHA for 5371470

• Merge pull request #2133 from samvera/update-deploy-for-hyrax-5-upgrade

  Show description for cd718f7
  

  Shana Moore

  authored
  cd718f7

  Copy full SHA for cd718f7

• Merge branch 'main' into i78-deploy-hyrax-5-upgrade

  

  Shana Moore

  authored
  eb42111

  Copy full SHA for eb42111

• Fixing locale_for tests to reflect I18n behavior

  jeremyf

  committed
  0fbde50

  Copy full SHA for 0fbde50

• 🐛 Use non-deprecated and non-removed method

  Show description for 5894b93
  jeremyf

  committed
  5894b93

  Copy full SHA for 5894b93

• Merge pull request #2140 from samvera/i78-deploy-hyrax-5-upgrade

  Show description for a72af34
  

  Shana Moore

  authored
  a72af34

  Copy full SHA for a72af34

• Merge branch 'main' into knapsack_gemfile

  orangewolf

  authored
  bc35b89

  Copy full SHA for bc35b89

• Fixing roles service

  jeremyf

  committed
  6b17b5c

  Copy full SHA for 6b17b5c

• Removing file that came along for the ride

  jeremyf

  committed
  ad0d56b

  Copy full SHA for ad0d56b

• Merge branch 'main' into merge-main-into-pals

  jeremyf

  authored
  577a49d

  Copy full SHA for 577a49d

Commits on Jan 9, 2024

• working on fixing redis deploy

  orangewolf

  committed
  6a23643

  Copy full SHA for 6a23643

• Merge pull request #2145 from samvera/redis-fix

  

  Shana Moore

  authored
  31fb129

  Copy full SHA for 31fb129

• 🐛 Restore translation

  Show description for b8d7a2e
  jeremyf

  committed
  b8d7a2e

  Copy full SHA for b8d7a2e

• Merge branch 'main' into merge-main-into-pals

  jeremyf

  authored
  b6f85d2

  Copy full SHA for b6f85d2

• Merge branch 'main' into knapsack_gemfile

  jeremyf

  authored
  ab3a9b0

  Copy full SHA for ab3a9b0

• 🧹 Revisiting translations

  jeremyf

  committed
  a880b50

  Copy full SHA for a880b50

• 🧹 Fix badge status for feature

  jeremyf

  committed
  2879a36

  Copy full SHA for 2879a36

• ♻️ Updating Gemfile to reflect pointing to main

  Show description for ff3532e
  jeremyf

  committed
  ff3532e

  Copy full SHA for ff3532e

Commits on Jan 10, 2024

• Add missing logo translation

  jeremyf

  committed
  6b7ba4b

  Copy full SHA for 6b7ba4b

• Merge pull request #2139 from samvera/knapsack_gemfile

  Show description for 1738679
  jeremyf

  authored
  1738679

  Copy full SHA for 1738679

• Revert "knapsack gemfile additions or replacement"

  jeremyf

  authored
  e43ce29

  Copy full SHA for e43ce29

• Merge pull request #2151 from samvera/revert-2139-knapsack_gemfile

  Show description for 040cba4
  jeremyf

  authored
  040cba4

  Copy full SHA for 040cba4

• Merge pull request #2150 from samvera/update-knapsack-ref

  Show description for 703917b
  jeremyf

  authored
  703917b

  Copy full SHA for 703917b

• Merge branch 'main' into merge-main-into-pals

  Show description for 1a02896
  jeremyf

  committed
  1a02896

  Copy full SHA for 1a02896

• Merge pull request #2138 from samvera/merge-main-into-pals

  Show description for b34f43b
  jeremyf

  authored
  b34f43b

  Copy full SHA for b34f43b

• 🧹 Specify knapsack required branch

  Show description for cde504f
  jeremyf

  committed
  cde504f

  Copy full SHA for cde504f

• Merge pull request #2152 from samvera/add-more-documentation-for-knapsack

  Show description for 391a7a3
  jeremyf

  authored
  391a7a3

  Copy full SHA for 391a7a3

• Merge branch 'main' into merge-main-into-i35

  Show description for 8fc5dc1
  jeremyf

  committed
  8fc5dc1

  Copy full SHA for 8fc5dc1

Commits on Jan 11, 2024

• Appeasing Rubocop

  jeremyf

  committed
  64387fb

  Copy full SHA for 64387fb

• Throwing the hound a bone

  jeremyf

  committed
  ae2674a

  Copy full SHA for ae2674a

• Merge branch 'i35-valkyrize-hyku' into merge-main-into-i35

  Show description for 193c9f1
  jeremyf

  committed
  193c9f1

  Copy full SHA for 193c9f1