Skip to content
This repository has been archived by the owner on Jul 31, 2023. It is now read-only.

Merge upstream #42

Merged
merged 2 commits into from
Oct 6, 2022
Merged

Merge upstream #42

merged 2 commits into from
Oct 6, 2022

Conversation

KeeyanGhoreshi
Copy link
Collaborator

This should contain the changes meant to be carried over by #41 but without the bungled merge commit upstream that was causing the REMS git history to get overwritten. I'm not sure if this will fix the fork auto syncs, but at the very least it does provide us with the two commits from upstream we were missing, namely the commits which fix various bugs with the app context and relaunch changes, including adaptive forms, and the logging changes which fix the DTR logging page.

KeeyanGhoreshi and others added 2 commits October 4, 2022 14:16
* logging changes

* remove console log

Co-authored-by: kghoreshi <kghoreshi@mitre.org>
* relaunch from appContext response

* implement search by order

* minor change to standalone

* fix util function

* check for standalone before prepop

* adaptive form fixes

* prepop adaptive form

Co-authored-by: kghoreshi <kghoreshi@mitre.org>
# Conflicts:
#	src/App.jsx
#	src/components/QuestionnaireForm/QuestionnaireForm.jsx
#	src/util/fetchArtifacts.js
@smalho01 smalho01 merged commit d3be7f4 into master Oct 6, 2022
@smalho01 smalho01 deleted the merge-upstream branch November 2, 2022 17:45
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants