Merge branch 'production' into issue-4989

.github/ISSUE_TEMPLATE/bug_report.md

@@ -18,6 +18,8 @@ Steps to reproduce the behavior:
 3. Scroll down to '....'
 4. See error
 
+*When reporting an issue on the `production` branch or any development version of Specify, please try to recreate the issue on the latest tagged release (`v7`) and indicate if it does not occur there, indicating a regression.*
+
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
@@ -26,17 +28,16 @@ If applicable, add screenshots to help explain your problem.
 
 **Crash Report**
 
-If the bug resulted in an error message, please click on "Download Error
-Message" and attach it here
-
-Please, also fill out the following information manually:
+If the bug resulted in an error message, please click on "Download Error Message" and attach it here. If there is no error, please follow [these instructions](https://discourse.specifysoftware.org/t/download-specify-7-system-information/1614) to download your System Information.
 
+Please fill out the following information manually:
 - OS: [e.g. Windows 10]
 - Browser: [e.g. Chrome, Safari]
 - Specify 7 Version: [e.g. 7.6.1]
 - Database Name: [e.g. kufish] (you can see this in the "About Specify 7" dialog)
 - Collection name: [e.g. KU Fish Tissue]
 - User Name: [e.g. SpAdmin]
+- URL: [e.g. https://ku_fish-v7.test.specifysystems.org/specify/workbench/215/]
 
 **Reported By**
 Name of your institution

.github/pull-request-template.md

@@ -1,6 +1,8 @@
 Fixes #
 
-
+<!--
+⚠️ **Note:** This PR affects database migrations. See [migration testing instructions](https://specify.github.io/testing/pull_requests.html#prs-tagged-with-label-migration).
+-->
 
 ### Checklist
 

.github/workflows/docker.yml

@@ -37,7 +37,7 @@ jobs:
             # See https://github.com/specify/specify7-test-panel/issues/110#issuecomment-1943045253
             VERSION=$(echo ${GITHUB_REF#refs/heads/} | sed -r 's#/+#-#g')
             if [ "${{ github.event.repository.default_branch }}" = "$VERSION" ]; then
-              VERSION=edge
+              VERSION=production
             fi
           elif [[ $GITHUB_REF == refs/pull/* ]]; then
             VERSION=pr-${{ github.event.number }}
@@ -82,9 +82,12 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           platforms: ${{ matrix.platform }}
-          labels: ${{ steps.meta.outputs.labels }}
-          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
-
+          build-args: |
+            BUILD_VERSION=${{ steps.prep.outputs.version }}
+            GIT_SHA=${{ github.sha }}
+          tags: ${{ steps.prep.outputs.tags }}
+          push: true
+
       - name: Export digest
         run: |
           mkdir -p /tmp/digests
@@ -134,4 +137,4 @@ jobs:
       
       - name: Inspect image
         run: |
-          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}

.gitignore

@@ -33,4 +33,6 @@ node_modules
 /specifyweb/frontend/js_src/coverage
 /local_specifyweb_apache.conf
 /specifyweb/frontend/js_src/stats.json
-/specifyweb/frontend/js_src/dist
+/specifyweb/frontend/js_src/dist
+.env
+docker-compose.yml

CHANGELOG.md

@@ -9,6 +9,26 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [7.9.7](https://github.com/specify/specify7/compare/v7.9.6.2...v7.9.7) (1 October 2024)
+
+### Added
+* Added an all-new **Bulk Carry Forward** feature to enable series data entry in Specify 7 ([#4804](https://github.com/specify/specify7/pull/4804), [#5120](https://github.com/specify/specify7/pull/5120) – _Requested by University of Minnesota Entomology, Bulgarian Academy of Sciences, KU Entomology, and many others_)
+* Added support for Geography Code at any rank when building a query ([#5094](https://github.com/specify/specify7/pull/5094) – _Requested by Museu de Ciències Naturals de Barcelona, KU Ichthyology, and many others_)
+* Added a preference (enabled by default) to insert a [UTF-8 BOM](https://en.wikipedia.org/wiki/Byte_order_mark#:~:text=%5B3%5D-,UTF%2D8,-%5Bedit%5D) to CSV exports ([#5204](https://github.com/specify/specify7/pull/5204))
+* When enabled, you should be able to open exported CSV files in Excel without using the import utility.
+
+### Changed
+* Removed the limit on the number of results returned when searching a tree in the tree viewer ([#5125](https://github.com/specify/specify7/pull/5125))
+* Descriptions for User Preferences have been improved ([#5064](https://github.com/specify/specify7/pull/5064))
+* Specify in Docker is now built for both `x64_86` and `arm64` architectures, enabling native deployment on ARM-based servers ([#5235](https://github.com/specify/specify7/pull/5235))
+* Collection, Discipline, Division, and the Audit Log are now visible in the list of query tables by default ([#5133](https://github.com/specify/specify7/pull/5133))
+
+### Fixed
+* Fixed an issue that caused table aggregation separators to be cleared when set to the default separator (`; `) ([#5240](https://github.com/specify/specify7/pull/5240))
+* Fixed an issue that allowed users to carry forward preparations in an interaction when cloning or using carry forward ([#4905](https://github.com/specify/specify7/pull/4905))
+* Fixed an issue that would cause a crash if an `ExportFeed` was configured with an invalid Specify user ID ([#5042](https://github.com/specify/specify7/pull/5042))
+* Fixed an issue where a border would not appear for query items in the report query dialog ([#5159](https://github.com/specify/specify7/pull/5159))
+
 ## [7.9.6.2](https://github.com/specify/specify7/compare/v7.9.6.1...v7.9.6.2) (22 July 2024)
 
 - Fixed an issue that prevented `TimestampModified` from being captured upon saving a record since the `v7.9.6` release ([#5108](https://github.com/specify/specify7/issues/5108) – *Reported by the University of Kansas and Ohio State University*)

Dockerfile

@@ -8,6 +8,7 @@ RUN apt-get update \
         python3.8 \
         libldap-2.4-2 \
         libmariadbclient18 \
+        rsync \
  && apt-get clean \
  && rm -rf /var/lib/apt/lists/*
 
@@ -68,6 +69,7 @@ COPY --chown=specify:specify manage.py /opt/specify7/
 COPY --chown=specify:specify docker-entrypoint.sh /opt/specify7/
 COPY --chown=specify:specify Makefile /opt/specify7/
 COPY --chown=specify:specify specifyweb.wsgi /opt/specify7/
+COPY --chown=specify:specify config /opt/specify7/config
 
 ARG BUILD_VERSION
 ARG GIT_SHA

README.md

@@ -2,7 +2,7 @@
 # [Specify 7](https://www.specifysoftware.org/products/specify-7/)
 
 The [Specify Collections Consortium](https://www.specifysoftware.org) is pleased
-to offer Specify 7, a web implementation of our biological collections data
+to offer Specify 7, the web implementation of our biological collections data
 management platform.
 
 We encourage members to use
@@ -15,30 +15,27 @@ access to this repository.
 
 The new generation of Specify combines the interface design components and data
 management foundation of Specify 6 with the efficiency and ease-of-use of
-web-based data access and cloud computing. The Specify 7 web application uses
+web-based data access and cloud computing. Specify 7 uses
 the same interface layout language as Specify 6, so any user interface
-customization made in one product is mirrored in the other. Also Specify 6 and
-Specify 7 use the same data model and can work from the same Specify MySQL
-database, which means they can be run simultaneously with any Specify
-collection. By providing an easy migration path to the web, Specify 7 helps
+customization made in one platform is mirrored in the other. Also Specify 6 and
+Specify 7 use the same data model and can work from the same Specify MySQL or MariaDB
+database, which means 6 and 7 can be run simultaneously with any Specify
+collection. Specify 7 helps
 transition Specify 6 collections to cloud computing. It is also a great starting
-platform for collections which prefer zero workstation software installation and
+platform for institutions that prefer zero workstation software installation and
 ubiquitous web browser access.
 
-Specify 7’s server/browser architecture open the door for computing support of
-collaborative digitization projects and for remote hosting of institutional or
-project specimen databases. Without the need for a local area or campus network
+Specify 7’s architecture supports collaborative digitization projects and remote hosting of specimen databases. Without the need for a local area or campus network
 to connect to the MySQL data server, Specify 7 gives you and your collaborators
-access to a shared specimen database through any web browser. Without adequate
-IT support to maintain a secure database server? With the Specify 7 server
+access to a shared specimen database through any web browser. Finding it challenging to obtain IT support to maintain a local secure database server? With the Specify 7 server
 software supported on generic Linux servers, museums can utilize a server
 hosting service to provide support for the technical complexities of systems
 administration, security management, and backing-up. Want to create a joint
-database with remote collaborators for a collaborative digitizing effort? No
+database for a collaborative digitizing effort? No
 problem! Host, hire a hosting service or use
 our [Specify Cloud](https://www.specifysoftware.org/products/cloud/) service for
 your Specify database, set up accounts and go. We provide the same efficient
-user interface and printed reports and labels customization, and help desk
+user interface, report and labels customization and help desk
 support for Specify 7 as we do for Specify 6.
 
 **Secure.**
@@ -69,7 +66,7 @@ The Specify Collections Consortium is funded by its member
 institutions. The Consortium web site is:
 https://specifysoftware.org
 
-Specify 7 Copyright © 2023 Specify Collections Consortium. Specify
+Specify 7 Copyright © 2024 Specify Collections Consortium. Specify
 comes with ABSOLUTELY NO WARRANTY. This is free software licensed
 under GNU General Public License 2 (GPL2).
 

config/backstop/app_resources.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<files>
+    <file level="0" mimetype="text/xml" name="UIFormatters"  description="UIFormatters" file="uiformatters.xml"/>
+    <file level="0" mimetype="text/xml" name="DataObjFormatters" description="DataObjFormatters" file="dataobj_formatters.xml"/>
+    <file level="0" mimetype="text/xml" name="TypeSearches"  description="TypeSearches" file="typesearch_def.xml"/>
+</files>