Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert unsw specific changes #831

Merged
merged 50 commits into from
May 26, 2022
Merged

Revert unsw specific changes #831

merged 50 commits into from
May 26, 2022

Conversation

shankari
Copy link
Contributor

No description provided.

shankari added 30 commits May 25, 2022 21:18
@shankari
Revert "chore: remove unused json"
0e5b692 
This reverts commit d825fc2.
@shankari
Revert "patch(Diary): update tripgj label directly with the new answer"
da18b27 
This reverts commit c5ead07.
@shankari
Revert "patch(Diary): get rid of isAnalyzed and migrate to isDraft"
557da8b 
This reverts commit 9e6a2cd.
@shankari
Revert "patch(Intro): use SurveyLaunch"
fe678f3 
This reverts commit c82d60a.
@shankari
Revert "patch(Settings): refactor to use new startSurveyPrefilled opt…
49134e8 
…ions param"

This reverts commit b8a7ab0.
@shankari
Revert "patch(Diary): optimize isAnalyzed call"
ae95bb6 
This reverts commit b57742a.
@shankari
Revert "patch(Settings): change domain to fourstep.dev"
a170632 
This reverts commit 2447ecb.
@shankari
Revert "patch(Login): login with anonymous token"
326e827 
This reverts commit 4b3cbab.
@shankari
Revert "patch(Login): login with anonymous token"
aaf3b96 
This reverts commit 4b3cbab.
@shankari
Revert "patch(Intro): update consent and intro pages to match RCITI p…
3c573c4 
…rofile"

This reverts commit b38e5a4.
@shankari
Revert "patch(Profile): add edit User Profile and End Survey buttons …
d4a2ab7 
…that launch surveys"

This reverts commit 32425b9.
@shankari
Revert "patch(Enketo): fix answers not restore correctly"
ad9a25f 
This reverts commit 04eb99f.
@shankari
Revert "patch(Diary): use EnketoSurvey for trip confirmation"
4309917 
This reverts commit e425caf.
@shankari
Revert "patch(Diary): Dynamic input confirm button sizing"
30a5283 
This reverts commit a7f43d1.
@shankari
Revert "feat(Enketo): Enketo survey support"
28a0b63 
This reverts commit fb338f1.
@shankari
Revert "patch(Tabs): hide Label and Heatmap tabs"
d1c946d 
This reverts commit 610fdab.
@shankari
Revert "Shorten trip confirm options with emojis 🙉"
bf53090 
This reverts commit 7e6672e.
@shankari
Revert "Modify trip confirm options"
b33cc66 
This reverts commit 26173fb.
@shankari
Revert "Update the login instruction"
c3a420e 
This reverts commit 75eb6db.
@shankari
Revert "Update the support line number"
0a91699 
This reverts commit 1ab1002.
@shankari
Revert "Make styling changes to consent-text.html"
757a96d 
This reverts commit 802d39a.
@shankari
Revert "Change consent text's text-align from 'justify' to 'left'"
caac463 
This reverts commit 8024fcb.
@shankari
Revert "Comment out onCurentTrip"
83b1999 
This reverts commit 32f3b07.
@shankari
Revert "Remove some options from the control list"
1c59d55 
This reverts commit 34980a7.
@shankari
Revert "Use the defined css classes in consent-text.html"
ac4b254 
This reverts commit 9c90fd8.
@shankari
Revert "Modify the login screen to only accept token"
fb69df0 
This reverts commit c1b2c6a.
@shankari
Revert "Increase text size in intro.css"
b05a20f 
This reverts commit 714018d.
@shankari
Revert "Replace a missing function"
05a113b 
This reverts commit ed2b9c2.
@shankari
Revert "Add edit user profile and end survey buttons."
f47f519 
This reverts commit 5104cec.
@shankari
Revert "Use an indirect link to open the user profile survey"
78e3329 
This reverts commit cdeaf45.
shankari added 20 commits May 25, 2022 23:04
@shankari
Revert "Use random token login and initial kobotoolbox survey"
85f17f1 
This reverts commit d2028a3.
@shankari
Revert "Comment out the summary screen"
663fb98 
This reverts commit 25e8795.
@shankari
Restore the labels for the survey option
c0c35e5
@shankari
Revert "Revert "feat(Enketo): Enketo survey support""
4420383 
This reverts commit 28a0b63.
@shankari
Manually revert isAnalysed function
5d41453 
Manually revert parts of
fb338f1
that are not related to enabling the survey code and that we don't want to restore
@shankari
Revert other changes that we don't want to include just yet
57f38b1
@shankari
Remove external survey launch dependency from the control settings
9cfa060 
Since we use the new button directive instead
@shankari
revert to multilabel + restore answers while switching between diary …
4271f28 
…and label

+ whitespace fixes
@shankari
Change the default options to map to MULTILABEL instead of ENKETO
83163b7 
To be consistent with the list view
@shankari
Revert the description for the share button
fcbe0bb 
Should change to NREL later
@shankari
One final change to metrics
8b991bd
@shankari
Remove merge conflict
89bd048
@shankari
Remove merge conflict!
ad526b7
@shankari
Revert email address from Amarin to me
10725e2
@shankari
Remove the overridden trip confirmation
a2a07be 
To avoid future merge conflicts
+ fix the sample
@shankari
Remove this specific configuration
be415bc 
To avoid future conflicts
+ expand the sample
@shankari
Restore whitespace
2151eed
@shankari
Fix whitespace
624f560
@shankari
Restore dashboard since we also restored the multilabel survey
3588c7b
@shankari
Ensure that we show the survey page after the login
ca8b795 
So we replace `finish` with `next`
This should not have been reverted
@shankari
Copy link
Contributor Author

All UNSW changes seem to have been reverted.
The demographic survey works.
The trip labels have some minor issues but we can resolve them later.
e-mission/e-mission-docs#727 (comment)

Squash merging this so that we can resolve the trip label issues and finally merge.

@shankari shankari merged commit e8c1321 into integrate_odk_compatible_surveys_using_enketo May 26, 2022
@shankari shankari mentioned this pull request May 27, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@shankari