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 main into i35 #2153

Merged
merged 51 commits into from
Jan 11, 2024
Merged
Changes from 1 commit
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
6a1e0c5
🎁 Contributions from PALNI/PALCI
Sep 11, 2023
6f9b88b
🎁 Contributions from PALNI/PALCI
jeremyf Dec 19, 2023
0166692
Updating translations
jeremyf Dec 19, 2023
d2649f9
🎁 Contribute back work from PALNI/PALCI
jeremyf Dec 19, 2023
17c9192
:gift: Hyrax 5 upgrade (#2047)
Jan 5, 2024
929565b
🤖 Update charts for deploy
Jan 5, 2024
045aa3a
Merge branch 'pals-contribute-back-to-prime' into merge-main-into-pals
jeremyf Jan 8, 2024
27cb0a9
♻️ Account for observed customizations
jeremyf Jan 8, 2024
99a9733
🧹 Appeasing Rubocop
jeremyf Jan 8, 2024
c7bbda6
Remove conflict in controller
jeremyf Jan 8, 2024
9cfca93
knapsack gemfile additions or replacement
orangewolf Jan 8, 2024
747601f
🐛 Add tests for all defined color methods
jeremyf Jan 8, 2024
821cbf2
🐛 Add placement_class for masthead rendering
jeremyf Jan 8, 2024
66d5292
🎁 fixes to unblock deploys
Jan 8, 2024
a559908
Removing unneeded file
jeremyf Jan 8, 2024
f2c6b89
Resolving menu structure for site configuration
jeremyf Jan 8, 2024
bcf2547
Merge branch 'update-deploy-for-hyrax-5-upgrade' into i78-deploy-hyra…
Jan 8, 2024
b2334fa
Applying changes in main to this work
jeremyf Jan 8, 2024
ead1017
update version to 6.0.0rc1 (#2137)
Jan 8, 2024
962b916
Merge branch 'main' into update-deploy-for-hyrax-5-upgrade
Jan 8, 2024
5371470
Merge branch 'main' into i78-deploy-hyrax-5-upgrade
Jan 8, 2024
cd718f7
Merge pull request #2133 from samvera/update-deploy-for-hyrax-5-upgrade
Jan 8, 2024
eb42111
Merge branch 'main' into i78-deploy-hyrax-5-upgrade
Jan 8, 2024
0fbde50
Fixing locale_for tests to reflect I18n behavior
jeremyf Jan 8, 2024
5894b93
🐛 Use non-deprecated and non-removed method
jeremyf Jan 8, 2024
a72af34
Merge pull request #2140 from samvera/i78-deploy-hyrax-5-upgrade
Jan 8, 2024
bc35b89
Merge branch 'main' into knapsack_gemfile
orangewolf Jan 8, 2024
6b17b5c
Fixing roles service
jeremyf Jan 8, 2024
ad0d56b
Removing file that came along for the ride
jeremyf Jan 8, 2024
577a49d
Merge branch 'main' into merge-main-into-pals
jeremyf Jan 8, 2024
6a23643
working on fixing redis deploy
orangewolf Jan 9, 2024
31fb129
Merge pull request #2145 from samvera/redis-fix
Jan 9, 2024
b8d7a2e
🐛 Restore translation
jeremyf Jan 9, 2024
b6f85d2
Merge branch 'main' into merge-main-into-pals
jeremyf Jan 9, 2024
ab3a9b0
Merge branch 'main' into knapsack_gemfile
jeremyf Jan 9, 2024
a880b50
🧹 Revisiting translations
jeremyf Jan 9, 2024
2879a36
🧹 Fix badge status for feature
jeremyf Jan 9, 2024
ff3532e
♻️ Updating Gemfile to reflect pointing to main
jeremyf Jan 9, 2024
6b7ba4b
Add missing logo translation
jeremyf Jan 10, 2024
1738679
Merge pull request #2139 from samvera/knapsack_gemfile
jeremyf Jan 10, 2024
e43ce29
Revert "knapsack gemfile additions or replacement"
jeremyf Jan 10, 2024
040cba4
Merge pull request #2151 from samvera/revert-2139-knapsack_gemfile
jeremyf Jan 10, 2024
703917b
Merge pull request #2150 from samvera/update-knapsack-ref
jeremyf Jan 10, 2024
1a02896
Merge branch 'main' into merge-main-into-pals
jeremyf Jan 10, 2024
b34f43b
Merge pull request #2138 from samvera/merge-main-into-pals
jeremyf Jan 10, 2024
cde504f
🧹 Specify knapsack required branch
jeremyf Jan 10, 2024
391a7a3
Merge pull request #2152 from samvera/add-more-documentation-for-knap…
jeremyf Jan 10, 2024
8fc5dc1
Merge branch 'main' into merge-main-into-i35
jeremyf Jan 10, 2024
64387fb
Appeasing Rubocop
jeremyf Jan 11, 2024
ae2674a
Throwing the hound a bone
jeremyf Jan 11, 2024
193c9f1
Merge branch 'i35-valkyrize-hyku' into merge-main-into-i35
jeremyf Jan 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add missing logo translation
jeremyf committed Jan 10, 2024
commit 6b7ba4b78c25729facb1218aaed7d56e8774cbbc
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
@@ -227,6 +227,7 @@ en:
custom_css: Custom CSS
favicon: Favicon
fonts: "Fonts"
logo: "Logo"
themes: "Themes"
roles_service_jobs:
header: Data Repair Jobs