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
Changes from 1 commit
Commits
Show all changes
24 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
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
747601f
🐛 Add tests for all defined color methods
jeremyf Jan 8, 2024
821cbf2
🐛 Add placement_class for masthead rendering
jeremyf Jan 8, 2024
a559908
Removing unneeded file
jeremyf Jan 8, 2024
f2c6b89
Resolving menu structure for site configuration
jeremyf Jan 8, 2024
b2334fa
Applying changes in main to this work
jeremyf 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
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
b8d7a2e
🐛 Restore translation
jeremyf Jan 9, 2024
b6f85d2
Merge branch 'main' into merge-main-into-pals
jeremyf Jan 9, 2024
a880b50
🧹 Revisiting translations
jeremyf Jan 9, 2024
2879a36
🧹 Fix badge status for feature
jeremyf Jan 9, 2024
6b7ba4b
Add missing logo translation
jeremyf Jan 10, 2024
1a02896
Merge branch 'main' into merge-main-into-pals
jeremyf Jan 10, 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
Merge branch 'main' into merge-main-into-pals
jeremyf authored Jan 9, 2024
commit b6f85d232d1c2909bac86b12d5dc450645f4b12b

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.