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.

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

Leopardsharks update 12 july 2021 #144

Merged
merged 54 commits into from
Jul 13, 2021

Conversation

Atticus29
Copy link
Contributor

No description provided.

Atticus29 and others added 30 commits May 13, 2021 00:10
…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
… stubs of returnJson on off chance its usage is desired. Also remove deleteMe statements
…jdo query with special character email addresses and case-insensitive email address searches
Revert "Merge pull request #128 from WildMeOrg/wb1691-hamburger-task-bug"

This reverts commit f2dcb92, reversing
changes made to f92efcd.
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
…e managing researcher was only displaying if said user had a non null affiliation
WB-1580 make user with edited username inherit its previous encounter…
colinwkingen and others added 24 commits June 22, 2021 15:26
WB-1652 remove extra db close transaction.
…o to the new uuid-based suspension email addresses
WB-1640 and WB-1639 create methods that consolidate accounts that do …
WB-1526 fix little baby bug where if locationID or taxonomy missing, …
@Atticus29 Atticus29 merged commit f17557e into leopardsharks Jul 13, 2021
@Atticus29 Atticus29 deleted the leopardsharks-update-12-july-2021 branch July 13, 2021 22:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants