Mderge 3.0.3 into deploy/dmponline#127
Merged
raycarrick-ed merged 135 commits intoDigitalCurationCentre:deploy/dmponlinefrom Jul 28, 2021
Merged
Mderge 3.0.3 into deploy/dmponline#127raycarrick-ed merged 135 commits intoDigitalCurationCentre:deploy/dmponlinefrom
raycarrick-ed merged 135 commits intoDigitalCurationCentre:deploy/dmponlinefrom
Conversation
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
… 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
Removed ror/fundref ids from the project details page
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
memoization no longer used so remove from definition.
Guard against nil funder template so correct exception gets raised (NoFunderTemplateError)
bug fix: customization upgrade #2898
…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.
Merging latest development into master
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
4 participants
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.
Fixes # .
Changes proposed in this PR: