Pull master into KDP_dev #41
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Adjust method of coordinating taxon rankIDs so that they are more in line with taxon ranks defined with taxonranks table - Accept inclusion of taxa even if the taxon rankID fails to be returned
- Handle section and subsection differently depending on kingdom equaling Animalia or Plantae, Fungi
- Add French version of Symbiota Guide originally put together by CCH2 project
GregoryPost
pushed a commit
that referenced
this pull request
Jan 10, 2023
Coll Management quicksearch
egbot
added a commit
that referenced
this pull request
Jun 27, 2024
Revert "Revert "Merge Symbiota-light developments into bryo-lichen code repo""
Atticus29
added a commit
that referenced
this pull request
Aug 6, 2024
# This is the 1st commit message: begin to implement front end of association-based search # This is the commit message #2: continue fleshing out the front and back end of association-based search # This is the commit message #3: rename some variables to be more accurate and fix a few array-vs-string handlers # This is the commit message #4: remove assistive-text lines # This is the commit message #5: fix issue with taxa suggest # This is the commit message #6: DRY up taxa suggest in a way that is usable for more than one element on the same page # This is the commit message #7: fix bug where reverse relationship was not returning results correctly # This is the commit message #8: begin to flesh out populating readRequestVariables with association-related data # This is the commit message #9: continue making progress with writing setAssociationRequestVariable method # This is the commit message #10: continue working on setAssociationRequestVariable and subfunctions # This is the commit message #11: continue subfunctionalizing # This is the commit message #12: continue fleshing out the associated-taxon query # This is the commit message #13: continue to make progress on the new search-by-association query infrastructure # This is the commit message #14: get search results to display # This is the commit message #15: Get the search criteria to display # This is the commit message #16: Update harvester.php (#1447) Modifies logic to display available boundary tool when no active geographic thesaurus exist in the DB # This is the commit message #17: CSS drop-down menus (#1452) * CSS drop-down menus Add styling to header.css that enables top drop-down menus # This is the commit message #18: Update OmCollections.php (#1455) Errant line of code short circuiting collection meta data update. # This is the commit message #19: closes #1449 which was preventing checklist polyaid from opening (#1458) # This is the commit message #20: Occurrence editor crowdsource adjustments - Add formatting for eventDate2 - Adjust exsicati - Remove from display: additional identifiers, behavior, vitality # This is the commit message #21: occurrence editor crowdsource adjustments - Add vertical-align to crowdsource css to override value set within reset.css - Force refresh of crowdsource.css within client's browsers # This is the commit message #22: crowdsource editor styling issue - resolve vertical-align issue, which persisted when opening in crowdsourcing mode and then switching between long and short forms - Fix fieldset padding issue within image popout # This is the commit message #23: Api media 2024 06 (#1463) - Fix route bug interfering with POST write calls - Add recordID UUID to POST call - Improve error output media object isn't found (400 error) - Improve standardization of all response output - Add sort fields to api documentation - Add function that attempts to determine mime type via file header. Has added benefit of ensuring input file exists. - Update swagger documentation # This is the commit message #24: Media API - Add ability to match images based on recordID UUID within PATCH call # This is the commit message #25: added confirmation windows for project and editor delete icons (#1454) # This is the commit message #26: [3.1] -burpsuite-fix: do not add taxa to query if there are special characters or quotes (#1436) * do not add taxa to query if there are special characters or quotes * cherry pick fix in 6250abd where getTaxonWhereFrag was getting un-cleaned taxon string * respond to code review feedback # This is the commit message #27: Occurrence download bug (#1478) - searchvar term is being sanitized prior to being set as a session variable, which is converting & to &, thus interfering with parsing of all terms after the first term. Translating & to & fixes the issue. - The cleanOutStr function santizes output using htmlspecialchars. The htmlspecialchars on line 638 will double sanitize output, thus converting "east & west" to "east & west". - Variable is getting sanitized within index.php with htmlspecialchars twice. Once on line 12 and again on line 205 Addresses GH issue: #1470 # This is the commit message #28: subfunctionalize the chip button click to the handleRemoval method # This is the commit message #29: only run getAssociatedTaxaSqlFragment when the relevant form field values are present in the query # This is the commit message #30: fix the behavior of the chip removal # This is the commit message #31: persist search terms # This is the commit message #32: fix the non-persisting taxon type selection # This is the commit message #33: remove var_dump # This is the commit message #34: fix bug where association search is not playing well with taxon accordion # This is the commit message #35: get the synonym searching to work # This is the commit message #36: get the sql command for wider taxa to work but not to display successfully on the UI yet # This is the commit message #37: remove spurious TODO and correct issue where usethes-associations and usethes were reversed # This is the commit message #38: Fix bug where synonym choice is not being respected # This is the commit message #39: Fix bug where synonym choice is not being respected # This is the commit message #40: Add all reciprocal relationships to drop down menu and Exclude non-relevant controlled vocabulary from the association dropdown list # This is the commit message #41: Accommodate no particular relationship in the search # This is the commit message #42: Accommodate no particular taxon in the search # This is the commit message #43: remove print statement # This is the commit message #44: add none as an option to the association dropdown and handle its logic # This is the commit message #45: remove cruft from classes/AssociationManager.php # This is the commit message #46: clean up OccurrenceListManager # This is the commit message #47: fix bug where family-based search was not working # This is the commit message #48: make the taxstatus join only happen when family is selected from the dropdown # This is the commit message #49: fix bug where there were duplicates in the relationship dropdown
themerekat
pushed a commit
that referenced
this pull request
Nov 27, 2024
themerekat
added a commit
that referenced
this pull request
Dec 12, 2024
* 3.1.1 Release: Merge Hotfix branch into Master (#1747) * Occurrence Mapping: Adjust SQL to relax enforcement of link to taxon thesaurus, thus to include records with coordinates but lacking thesaurus relationship * Styling: Various styling, spacing, and display adjustments * Occurrence search: add type attribute to buttons to avoid defaulting as submit buttons * Occurrence Profile: Fix error triggered when otherCatalogNumbers are used to create backlink to original snapshot record within external institution web resource * Occurrence editing functions -- Fix fatal error triggered by cloning an occurrence record with the create association option selected -- Fix fatal error triggered when quick association feature is activated within occurrence editor -- Fix fatal error when deleting an occurrence when the occurrence was previously deleted (e.g. record already in omoccurarchive) -- Adjust occurrence restore option to dynamically determine associationType when restoring a record that was deleted prior to this field being added as a required input -- If resource association does not have an objectID, use url as the display text * Taxonomy editor: bug fix triggered by adding a child directly to the root node of the thesaurus (e.g. kingdom) * Scientific name parsing utility functions: Integrate cleanInfra function directly into code. It served no purpose being separate, and was also causing a bug where parent authors were being incorrectly merged with insfraspecific authors --------- Co-authored-by: Katie Pearson <[email protected]> Co-authored-by: Mark <[email protected]> Co-authored-by: MuchQuak <[email protected]> Co-authored-by: Logan Wilt <[email protected]> * 3.1.2 Release: Merge Hotfix branch into Master (#1770) * Hotfix v.3.1.3 (#1821) * Hotfix v3.1.3 - Adjusted hotfix merge instructions - Inventory Management: Bug fix interfering with adding new editors to an inventory project - Image migration modifications -- Add option to copy over existing target files -- Add checks and error handling for non-existent source files and already existing target files -- Direct log files to be written to /content/logs/ - fix misspelled log directory name, with support still maintained for portals that already have the misspelled directory - Fix jquery selector to be correct so button is enabled when trait is changed - Misc language file and wording adjustments * Hotfix 3.1.4 (#1858) - Checklist voucher link bug -- Resolves issue where checklist link PK is not passed to link function. -- Resolves issue: #1828 - Specimen upload bug -- Add IGNORE to avoid complete failure of insert statement -- Capture and display warnings to user -- Fix display of final record process count - Occurrence Search breadcrumb bug fix -- Add comingFrom variable to pagination links within the list and tablelist pages -- If comingFrom variable is not set, or set to anything other than "newsearch" or "harvestparams", set the variable to what is defined as the default within the symbini file. If default action is not defined within symbini, default to new search form. -- Add comingFrom variable to harvestparams.php form -- Resolves issue: #1840 - Occurrence Association Form Validation bug -- Fix issue with internal association form validation failing and allowing for creation of an association without an internal occurrence being defined -- Add form validation for external resource and general observation -- Addresses issue: #1852 -- Add guid omoassociations RecordID on insert within occurrence editor - Vendor library updates via composer -- update phpoffice/phpspreadsheet to v3.3.0 -- updated phpseclib/phpseclib explicitly to v3.0.42 -- update phpoffice/phpword to v1.3.0 - Fix data binding bug associated with searching occurrence via GUID within Occurrence Profile pages - Misc language translation issues --------- Co-authored-by: Edward Gilbert <[email protected]> Co-authored-by: Mark <[email protected]> Co-authored-by: MuchQuak <[email protected]> Co-authored-by: Logan Wilt <[email protected]> Co-authored-by: Greg Post <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.