Merge dev into master for version 1.22.0#807
Merged
mehtaparabaci merged 37 commits intomasterfrom Jun 26, 2025
Merged
Conversation
…nto milestone_2025
…enses and blog posts tables
Merge master into dev
…quired in FundForm
- Added 'mastodon_username' and 'mastodon_instance' fields to Claimant model - Added 'bluesky' field to Claimant model - Updated Fellow form to display Mastodon username and instance inline with improved layout and spacing - Styled help text and separators for consistency with other fields - Updated admin panel to include new fields under 'Social Media' - Updated claimant detail and index pages to display Mastodon and Bluesky profiles with correct icon links - Updated Bootstrap version in bootstrap.sh to support new icons - Removed Edit button from claimant profile page for staff users - Included related migration files (0163–0165)
…' tab to dashboard
…lled tab, fix Edit visibility - Removed 'Removed' from expense status dropdown for staff (still visible to superusers) - Added helper text warning about 'Removed' visibility - Added 'Cancelled' tab to expenses dashboard for staff/superuser - Fixed Edit button visibility logic for fellows using can_edit_expense filter - 'All' tab shows all claims with color coding by status
…eview form, add Cancelled tab, fix edit visibility
…ication to finance
…new required fields
Merge Milestone 2025 into dev
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge all changes developed under
milestone_2025into master