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

Hotfix 2024 08 07 (#1606) #530

Merged
merged 1 commit into from
Aug 12, 2024
Merged

Hotfix 2024 08 07 (#1606) #530

merged 1 commit into from
Aug 12, 2024

Conversation

egbot
Copy link
Member

@egbot egbot commented Aug 12, 2024

Taxonomy Editor

  • Add taxamaps table to data remapping functions when taxon is deleted or remapped. Resolves issue #1598
  • Minor error fixes and adjustments to language file imports Glossary Management
  • Fix issue associated within new sources failing to save when displaying all terms without a taxon group selected. Resolves issue #1584
  • Display all source definitions when taxon group is not selected
  • Minor adjustments to language terms and misc code Occurrence Cleaner - duplicate merge tool
  • Replace catalog numbers as the unique identifier for duplicate cluster with numeric key, thus avoiding interference of target form element due to existence of space or period within catalog number. Resolves issue #1471
  • Internationize first submit button
  • Add header and footer to cleaning page Specimen Upload
  • Remove display of Data Versioning Checkbox option for snapshot datasets. Batch import data versioning is only available for live managed collections.

Pull Request Checklist:

Pre-Approval

  • There is a description section in the pull request that details what the proposed changes do. It can be very brief if need be, but it ought to exist.
  • Hotfixes should be branched off of the master branch and squash and merged back into the master branch.
  • Features and backlog bugs should be merged into the Development branch, NOT master
  • All new text is preferably internationalized (i.e., no end-user-visible text is hard-coded on the PHP pages), and the spreadsheet tracking internationalizations has been updated either with a new row or with checkmarks to existing rows.
  • There are no linter errors
  • New features have responsive design (i.e., look aesthetically pleasing both full screen and with small or mobile screens)
  • Symbiota coding standards have been followed
  • If any files have been reformatted (e.g., by an autoformatter), the reformat is its own, separate commit in the PR
  • Comment which GitHub issue(s), if any does this PR address
  • If this PR makes any changes that would require additional configuration of any Symbiota portals outside of the files tracked in this repository, make sure that those changes are detailed in this document.

Post-Approval

  • It is the code author's responsibility to merge their own pull request after it has been approved
  • If this PR represents a merge into the Development branch, remember to use the squash & merge option
  • If this PR represents a merge from the Development branch into the master branch, remember to use the merge option
  • If this PR represents a hotfix into the master branch, a subsequent PR from master into Development should be made merge option (i.e., no squash).
  • If the dev team has agreed that this PR represents the last PR going into the Development branch before a tagged release (i.e., before an imminent merge into the master branch), make sure to notify the team and lock the Development branch to prevent accidental merges while QA takes place. Follow the release protocol here.
  • Don't forget to delete your feature branch upon merge. Ignore this step as required.

Thanks for contributing and keeping it clean!

Taxonomy Editor
- Add taxamaps table to data remapping functions when taxon is deleted or remapped. Resolves [issue #1598](#1598)
- Minor error fixes and adjustments to language file imports
Glossary Management 
- Fix issue associated within new sources failing to save when displaying all terms without a taxon group selected. Resolves [issue #1584](#1584) 
- Display all source definitions when taxon group is not selected
- Minor adjustments to language terms and misc code
Occurrence Cleaner - duplicate merge tool
- Replace catalog numbers as the unique identifier for duplicate cluster with numeric key, thus avoiding interference of target form element due to existence of space or period within catalog number. Resolves [issue #1471](#1471) 
- Internationize first submit button
- Add header and footer to cleaning page
Specimen Upload
- Remove display of Data Versioning Checkbox option for snapshot datasets. Batch import data versioning is only available for live managed collections.
@egbot egbot requested review from kyule and sunray1 August 12, 2024 15:48
@egbot egbot merged commit 5ce4040 into BioKIC:master Aug 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants