Merging the latest Stage to Main - #807

Merged

briri merged 122 commits into

mainfrom

Aug 4, 2026

Commits on Jun 17, 2026

Updated 'users' resolver to include 'role' param, and added findByAffiliationIdAndUserRole and updated search functions in the User model
jupiter007
committed
4bd3e65

Commits on Jun 18, 2026

Commits on Jun 22, 2026

Added affiliationId variable to 'users' resolver
jupiter007
committed
115641f
Added affiliationId variable to 'users' resolver
jupiter007
committed
6314f69
added a research output question to the local default template
briri
committed
e8fee59

Commits on Jun 23, 2026

Commits on Jun 24, 2026

Commits on Jun 25, 2026

Commits on Jun 26, 2026

Added archiveUser resolver and userProjects query resolver
jupiter007
committed
b9fa6ad
Added isArchived field to users table
jupiter007
committed
15bd915
Added unit test for Plan model
jupiter007
committed
bac5549

Commits on Jun 27, 2026

Removed debugging logs from requestFeedback, and added better messaging and checks for when feedback is not enabled or there are no feedback emails. Also, fixed the updateAffiliation resolver so th…
jupiter007
committed
2bd0bfb

Commits on Jun 29, 2026

Removed it.only from test
jupiter007
committed
04732e2
added SQL scripts folder
briri
committed
67058d7
updated changelog
briri
committed
ea2b08a
Responded to PR comments
jupiter007
committed
afc7c51
replace all CURDATE in SQL files with NOW
briri
committed
9078f57
Updated 'user' to 'planCreator' for plans chained resolver
jupiter007
committed
6e77ea2
removed errors for when there are no feedbackEmails or feedbackEnabled is false, since the frontend will do the check and disable the request link
jupiter007
committed
f68d5e9
merged development into branch
jupiter007
committed
e5eaacd
Merge pull request #774 from CDLUC3/feature/281/JS-create-editable-user-profile-page
jupiter007
authored
034b09a

Commits on Jun 30, 2026

Commits on Jul 7, 2026

Added contactUs resolver and schema
jupiter007
committed
b130b3d
Updated VersionedGuidance and Guidance models to make tagId be optional
jupiter007
committed
64d01c5

Commits on Jul 8, 2026

Commits on Jul 9, 2026

Added EZID config and datasource for registering dmpIds with EZID
jupiter007
committed
bcd6318

Commits on Jul 10, 2026

fixed some lingering issues and updated to use new versions of @dmptool packages
briri
committed
71ad59d
removed debug line
briri
committed
bfbdd9b
added logic to fix researchOutput answers
briri
committed
11b4025

Commits on Jul 13, 2026

Commits on Jul 14, 2026

added updatePlan resolver for rest API
briri
committed
b067b0c
cleaned up spacing issue in plan resolver
briri
committed
24984a7
update changelog
briri
committed
7c5b74b
Removed ezid password from .env.example
jupiter007
committed
3541d37

Commits on Jul 15, 2026

Commits on Jul 16, 2026

Commits on Jul 17, 2026

Commits on Jul 21, 2026

Commits on Jul 22, 2026

Commits on Jul 23, 2026

finished up mysql transaction support. added new entirePlanService
briri
committed
1c27ba7

Commits on Jul 24, 2026

cleanup of some files
briri
committed
9ec5325
cleanup after reviewing PR and updated CHANGELOG
briri
committed
7cbb15b
Merge branch 'development' of github.com:CDLUC3/dmptool-apollo-server into feature/update-delete-api-support
briri
committed
40684f2
Added additional errors to PLanErrors
briri
committed
5bf16f0
fixed issue with addentireplaninput
briri
committed
c983f6a
fixed issue with addentireplaninput
briri
committed
ba84ecd

Commits on Jul 25, 2026

Commits on Jul 27, 2026

Added some more logging and validation to PasswordResetToken
jupiter007
committed
722fa1e
Updated CHANGELOG.md
jupiter007
committed
5957ade
Merge pull request #793 from CDLUC3/bug/311/JS-fix-delete-fundings
jupiter007
authored
00e7228
Added override for brace-expansion to v5.0.8
jupiter007
committed
432620b
Merge pull request #797 from CDLUC3/chore/314/JS-address-vulnerabilities
briri
authored
d559ab2
Responded to PR comments
jupiter007
committed
9df975e
update to use new EntirePlan prefixed inputs
briri
committed
f2152bf
Merge branch 'development' of github.com:CDLUC3/dmptool-apollo-server into feature/update-delete-api-support
briri
committed
f46dfaf
fixed error handling in withTransaction
briri
committed
c820522

Commits on Jul 29, 2026

Merge pull request #798 from CDLUC3/bug/JS-add-missing-fast-xml-parser
briri
authored
c88d9ab

Commits on Jul 30, 2026

Commits on Jul 31, 2026

Commits on Aug 3, 2026

update CHANGELOG
briri
committed
06213a1
Merge branch 'development' of github.com:CDLUC3/dmptool-apollo-server into feature/update-delete-api-support
briri
committed
e7a96d5
Merge pull request #801 from CDLUC3/feature/update-delete-api-support
briri
authored
851a336
add overrides for sec vulnerabilities
briri
committed
3843611
Merge pull request #804 from CDLUC3/chore/upd-deps
briri
authored
a55217b
Merge pull request #806 from CDLUC3/development
jupiter007
authored
1f15e81