Merging latest development into master #2981
Merged
Conversation
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
fix issue 2845
…er_fix_redirect redirect to edit page of notification after successfull creation/update
Fix share required params
plan/edit: produce less queries
…ccounts Issue #462 - Fix for error messaging when you attempt Merge accounts
… the Export Plan coversheet.
Changes:
The Start and End Dates, ID and Grant Number was added the Project
Details section of the Export Plans.
run application within RAILS_RELATIVE_URL_ROOT
Update to JS spinner
Add ability for Super Admins to merge Orgs
Fix issue with user losing their role on plans when creating an account
Add pagination/sort/search args to the query string
raycarrick-ed
approved these changes
Jul 27, 2021
Contributor
raycarrick-ed
left a comment
raycarrick-ed
left a comment
There was a problem hiding this comment.
As far as I can tell this looks good to go. I've had a brief skim through the changes and it all looks ok, i think. So let's try it and see.
…f_coversheet_details
…ate_to_pdf_coversheet_details Issue #2972 - Add project Start and End Dates, ID and Grant Number to he Export Plan coversheet.
portagenetwork
pushed a commit
to portagenetwork/roadmap
that referenced
this pull request
Feb 24, 2022
Merging latest development into master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Hey @raycarrick-ed here's the PR to merge dev into master. See if you can resolve those other 2 open PRs though before this one.
Note that the JS spinner was added to the app/views/layouts/application.html.erb which is typically branded.
restrict_orgsflagorg.plansso that we're allowing Rails' baseline functionality to work as expected