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

Manta update #136

Merged
merged 43 commits into from
Jul 2, 2021
Merged

Manta update #136

merged 43 commits into from
Jul 2, 2021

Conversation

Atticus29
Copy link
Contributor

No description provided.

Atticus29 and others added 30 commits May 13, 2021 00:10
@Atticus29
WB-1640 and WB-1639 create methods that consolidate accounts that do …
bcadbaf 
…not have usernames with those that do and share an email address. Also create methods that suspend accounts with matching email address but non null usernames that are lower credentialed that the most highly credentialed of the set
@Atticus29
WB-1640 and WB-1639 respond to JVO feedback and WB-1638 pt1
2b3058b
@Atticus29
WB-1637 Encounters made by public should have metadata be editable ex…
49ac592 
…cept for submitter-related info
@Atticus29
WB-1641 assign usernameless non-null emails to anonymous
8211e1c
@Atticus29
WB-1642 assigning users with missing or invalid email addresses uuid+@…
a33a0fa 
…localhost
@Atticus29
WB-1664 change username and email address of usernameless and emailad…
70314a6 
…dressless accounts
@Atticus29
WB-1643 add indicator that account has been suspended to welcome.jsp …
a3eb9a0 
…page
@Atticus29
WB-1674 build out ui for running the de-dupe steps, and create little…
5210b8f 
… stubs of returnJson on off chance its usage is desired. Also remove deleteMe statements
@colinwkingen
WB-1680
ce76596
@Atticus29
WB-1652 remove extra db close transaction.
1f6fb8a
@colinwkingen
WB-1690 fix refs to request param 'number'
787de18
@naknomum
quick fix to allow comparing Tasks
eb3473a
@naknomum
some contain-y methods
39d1d09
@Atticus29
cherry pick d5aac23 which is a fix for WB-1684
007df45
@Atticus29
cherry pick of 389934c which is a fix for WB-1648 special character w…
f92efcd 
…ith single asset upload bug
@Atticus29
WB-1674 improve return Json per JVO CR feedback, fix minor bugs with …
48c2f74 
…jdo query with special character email addresses and case-insensitive email address searches
@naknomum
how have we gone this long without equals/hashCode on these two things?
fb91620
@naknomum
now we only add tasks which have to do (deeply) with the annotation i…
c66c185 
…n question
@holmbergius
Merge pull request #128 from WildMeOrg/wb1691-hamburger-task-bug
f2dcb92 
WB-1691: hamburger task bug
@holmbergius
Reverting merge until QA is done
193c717 
Revert "Merge pull request #128 from WildMeOrg/wb1691-hamburger-task-bug"

This reverts commit f2dcb92, reversing
changes made to f92efcd.
@holmbergius
Revert "Reverting merge until QA is done"
61e6821 
This reverts commit 193c717.
@holmbergius
WB-1691 companion fix to compile
118ecea
@holmbergius
WB-1687:
cdbb9b7 
1) make sure to register MediaAsset and Annotation for ACM IDs
2) if the only annotation on the MediaAsset is a part, and you're drawing a non-part, assume they're related and don't clone. Edge case but happen's for Rissos.

# Conflicts:
#	src/main/webapp/encounters/manualAnnotation.jsp
@Atticus29
WB-1580 make user with edited username inherit its previous encounter…
451a359 
…s and stuff
@Atticus29
WB-1638 fix bug where public user was not persisting and fix bug wher…
9642bed 
…e managing researcher was only displaying if said user had a non null affiliation
@Atticus29
Merge pull request #129 from WildMeOrg/WB-1580-username-update-fix
da71b47 
WB-1580 make user with edited username inherit its previous encounter…
@Atticus29
WB-1694 prevent user/admin from updating user to have non-unique or e…
507f926 
…mpty username and/or email address
@colinwkingen
wee fix for WB-1680
76a48b4
@naknomum
WB-1696 exif orientation
a94b7b1
@Atticus29
Merge pull request #127 from WildMeOrg/createadoption-exception
b7a5931 
WB-1652 remove extra db close transaction.
Atticus29 and others added 13 commits June 23, 2021 09:31
@Atticus29
cherry pick of e317f85 from manta-update for WB-1652
088b107
@Atticus29
WB-1642 more informative log output to better connec the old user inf…
e052ad1 
…o to the new uuid-based suspension email addresses
@Atticus29
WB-1693 respond to JVO CR feedback and catch and squash a bug
9129f8f
@Atticus29
resolve merge conflicts with master
9a26fc1
@Atticus29
fix merge conflict in UserCreate that prevented build
96d5c7e
@Atticus29
Merge pull request #114 from WildMeOrg/automated-deduplication-tasks
96dfed3 
WB-1640 and WB-1639 create methods that consolidate accounts that do …
@colinwkingen @holmbergius
WB-1685 fix no parameter sighting search
336e17a
@JasonWildMe @holmbergius
WB-1685: fewer shepherds, better exception handling
182b384
@JasonWildMe @holmbergius
WB-1685: part 3 - switch to standardized species display. next up che…
2c689dc 
…ck for outliers (bad values)
@holmbergius
WB-1685: part 4 (apply needed data integrity check, plus some minor f…
d829de3 
…ile cleanup)
@holmbergius
WB-1685 remove old cruft code after code review
71bbc04
@naknomum
handle NPE problem. ask for a copy of nothing, you get nothing.
f1fb521
@Atticus29
fix manta merge update conflicts
8f8c798
@Atticus29 Atticus29 merged commit d2c3298 into mantamatcher.org Jul 2, 2021
@Atticus29 Atticus29 deleted the manta-update branch July 2, 2021 21:24
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.
5 participants
@Atticus29 @naknomum @colinwkingen @holmbergius @JasonWildMe