Remove non-template contacts and aboutproject files #1864
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
egbot
approved these changes
Nov 14, 2024
There was a problem hiding this comment.
Yes, it looks like I did this back in 2020. I've seen these previously, and considered removing, but doing so means that we'll have to be careful when updating portals to v3.2. If site have legitimate versions of these file, they will likely be deleted and will have to be reloaded the correct files. I'm still in favor of removing, but we just have to be aware and make sure we don't lose good files.
Ah, right, because git will just say "oh ok, remove this file!" even if the two versions are totally different. Rats, good to know. |
|
Apologies for not reviewing this sooner. Doing some research I think the way this issue should be handled would be to remove the file(s) from the staging tree - See https://gist.github.com/mcrd25/1b2718054b65f4720fa582c6a4032217 |
GregoryPost
added a commit
that referenced
this pull request
Nov 15, 2024
This reverts commit e03eb81.
|
I attempted to perform the procedure outlined in the article above - however it did not work. I eventually found this article - https://stackoverflow.com/questions/43996610/git-how-to-untrack-a-file-from-remote-repository-but-still-keep-it-in-all-devel - which outlines why it does not work and lays out a method tht would work, but is much more challenging and treacherous to implement. I rebased back to @themerekat PR, as I think that is the most practical solution. We will just have to be sure to make backups of local files before applying this update. |
|
Thanks for doing that, @GregoryPost ! Maybe we should write down our updating protocol (or at least centralize what we already have) and make sure that this warning is at the beginning for the next round of updates. |
GregoryPost
added a commit
that referenced
this pull request
Dec 11, 2024
* Add login form button to prevent circular links * Bump symfony/process from 5.4.19 to 5.4.46 in /api * Bump symfony/http-foundation from 5.4.20 to 5.4.46 in /api * Remove non-template contacts and aboutproject files (#1864) * Add condition for elevation type number in searchform.js, fixed typo for maximum elevation * Fix typos * Unify top/northern, bottom/southern usage * Fix image alignment and button names in flashcards (#1881) * Fix image alignment and button names * Add stylesheet, removed in-line styling, added flex classes for games in main.css * Fix over-translated lang tags (#1911) * closes #1916 by removing union return type * Fix parsing issue * Fix (#1920) * Resolve editor lock bug * Resolves issue: #1923 * Collection Profile issue * Add form value interpolation for EW NS and units values so sessions is loaded correctly * Update API Vendor Libraries * Closes #1942 Adjust Language Tags of Cross Portal Results * Improve Sign-in and Contact Us button layout on <768px wide devices. --------- Co-authored-by: Edward Gilbert <[email protected]> Co-authored-by: Katie Pearson <[email protected]> Co-authored-by: Nikita Salikov <[email protected]> Co-authored-by: MuchQuak <[email protected]>
This was referenced Dec 12, 2024
themerekat
added a commit
to BioKIC/African-Herbaria
that referenced
this pull request
Dec 12, 2024
* 3.1.1 Release: Merge Hotfix branch into Master (BioKIC#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 (BioKIC#1770) * Hotfix v.3.1.3 (BioKIC#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 (BioKIC#1858) - Checklist voucher link bug -- Resolves issue where checklist link PK is not passed to link function. -- Resolves issue: BioKIC#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: BioKIC#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: BioKIC#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 * Hotfix 3.1.5 (BioKIC#1956) * Add login form button to prevent circular links * Bump symfony/process from 5.4.19 to 5.4.46 in /api * Bump symfony/http-foundation from 5.4.20 to 5.4.46 in /api * Remove non-template contacts and aboutproject files (BioKIC#1864) * Add condition for elevation type number in searchform.js, fixed typo for maximum elevation * Fix typos * Unify top/northern, bottom/southern usage * Fix image alignment and button names in flashcards (BioKIC#1881) * Fix image alignment and button names * Add stylesheet, removed in-line styling, added flex classes for games in main.css * Fix over-translated lang tags (BioKIC#1911) * closes BioKIC#1916 by removing union return type * Fix parsing issue * Fix (BioKIC#1920) * Resolve editor lock bug * Resolves issue: BioKIC#1923 * Collection Profile issue * Add form value interpolation for EW NS and units values so sessions is loaded correctly * Update API Vendor Libraries * Closes BioKIC#1942 Adjust Language Tags of Cross Portal Results * Improve Sign-in and Contact Us button layout on <768px wide devices. --------- Co-authored-by: Edward Gilbert <[email protected]> Co-authored-by: Katie Pearson <[email protected]> Co-authored-by: Nikita Salikov <[email protected]> Co-authored-by: MuchQuak <[email protected]> --------- 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]> Co-authored-by: Greg Post <[email protected]>
themerekat
added a commit
to BioKIC/African-Herbaria
that referenced
this pull request
Dec 13, 2024
* 3.1.1 Release: Merge Hotfix branch into Master (BioKIC#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 (BioKIC#1770) * Hotfix v.3.1.3 (BioKIC#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 (BioKIC#1858) - Checklist voucher link bug -- Resolves issue where checklist link PK is not passed to link function. -- Resolves issue: BioKIC#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: BioKIC#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: BioKIC#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 * Hotfix 3.1.5 (BioKIC#1956) * Add login form button to prevent circular links * Bump symfony/process from 5.4.19 to 5.4.46 in /api * Bump symfony/http-foundation from 5.4.20 to 5.4.46 in /api * Remove non-template contacts and aboutproject files (BioKIC#1864) * Add condition for elevation type number in searchform.js, fixed typo for maximum elevation * Fix typos * Unify top/northern, bottom/southern usage * Fix image alignment and button names in flashcards (BioKIC#1881) * Fix image alignment and button names * Add stylesheet, removed in-line styling, added flex classes for games in main.css * Fix over-translated lang tags (BioKIC#1911) * closes BioKIC#1916 by removing union return type * Fix parsing issue * Fix (BioKIC#1920) * Resolve editor lock bug * Resolves issue: BioKIC#1923 * Collection Profile issue * Add form value interpolation for EW NS and units values so sessions is loaded correctly * Update API Vendor Libraries * Closes BioKIC#1942 Adjust Language Tags of Cross Portal Results * Improve Sign-in and Contact Us button layout on <768px wide devices. --------- Co-authored-by: Edward Gilbert <[email protected]> Co-authored-by: Katie Pearson <[email protected]> Co-authored-by: Nikita Salikov <[email protected]> Co-authored-by: MuchQuak <[email protected]> * Header render Fixes (BioKIC#1962) * Switch header buttons to use HTML button element for better UX * Adjust styling to restoring honoring header button text color * Improve header button layout on <768px display --------- 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]> 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.
Pull Request Checklist:
Some non-template versions of files somehow made it into the repo
Pre-Approval
masterbranch and PR'd using the merge option (not squashed) into thehotfixbranch.Post-Approval
hotfixbranch, remember to use the merge option (i.e., no squash).hotfixbranch into themasterbranch use the squash & merge option