Skip to content

Commit 3712e70

Browse files
authored
Merge pull request #2211 from griidc/release/6.83.0
Release/6.83.0
2 parents a3de67c + c3bd443 commit 3712e70

28 files changed

+2915
-2098
lines changed

.env

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ DOWNLOAD_PATH="path/to/zip"
5656
GCMD_VERSION="16.9"
5757
GCMD_VERSION_YEAR="2023"
5858
ANZSRC_VERSION="2020"
59+
EXPORT_REVIEW_PATH='/mnt/inspect-review-dataset'
5960

6061
###> INDEX NAMES ###
6162
DISCOVERY_INDEX=pelagos_instancename

.github/workflows/eslint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup PHP with PECL extension
1818
uses: shivammathur/setup-php@v2
1919
with:
20-
php-version: '8.3'
20+
php-version: '8.4'
2121

2222
- name: Install dependencies
2323
run: composer install --no-progress

.github/workflows/phpcs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup PHP with PECL extension
1818
uses: shivammathur/setup-php@v2
1919
with:
20-
php-version: '8.3'
20+
php-version: '8.4'
2121

2222
- name: Validate composer.json and composer.lock
2323
run: composer validate --strict

.github/workflows/phpunit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
- name: Setup PHP with PECL extension
1818
uses: shivammathur/setup-php@v2
1919
with:
20-
php-version: '8.3'
20+
php-version: '8.4'
2121

2222
- name: Validate composer.json and composer.lock
2323
run: composer validate --strict

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,18 @@
1414
npm-debug.log
1515
yarn-error.log
1616
###< symfony/webpack-encore-bundle ###
17+
1718
###> symfony/phpunit-bridge ###
1819
.phpunit
1920
.phpunit.result.cache
2021
/phpunit.xml
2122
###< symfony/phpunit-bridge ###
2223

24+
###> Symfony CLI ###
25+
.php-version
26+
.symfony.local.yaml
27+
###< Symfony CLI ###
28+
2329
.idea
2430
/public/js/fos_js_routes.json
2531

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ These instructions will get you a copy of the project up and running on your loc
99

1010
### Prerequisites
1111

12-
* [Redhat Linux 9+](https://www.redhat.com/) - Redhat Linux or compatible
13-
* [PHP 8.3+](http://php.net/docs.php) - General-purpose scripting language
12+
* [Redhat Linux 8+](https://www.redhat.com/) - Redhat Linux or compatible
13+
* [PHP 8.4+](http://php.net/docs.php) - General-purpose scripting language
1414
* [Composer 2.9.2+](https://getcomposer.org/) - Dependency Manager for PHP
1515
* [Yarn 4.12.0+](https://yarnpkg.com/en/) - Package Manager
1616
* [PostgreSQL 14+](https://www.postgresql.org) - ORDBMS
@@ -32,7 +32,7 @@ To install fullfill prerequisites then run:
3232
See the list of [contributors](https://github.com/griidc/pelagos/contributors) who participated in this project.
3333

3434
## License
35-
Copyright © 2025 Texas A&M University-Corpus Christi
35+
Copyright © 2026 Texas A&M University-Corpus Christi
3636

3737
Redistribution and use in source and binary forms, with or without modification,
3838
are permitted provided that the following conditions are met:

assets/js/entry/inspect-fileset.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
import '../../scss/inspect-fileset.scss';

assets/scss/components/inputs.scss

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
@layer components {
2+
.input-base {
3+
@apply bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5;
4+
}
5+
6+
.textarea-base {
7+
@apply block p-2.5 w-full text-sm text-gray-900 bg-gray-50 rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500;
8+
}
9+
10+
.radio-base {
11+
@apply w-4 h-4 text-blue-600 bg-gray-100 border border-gray-300 focus:ring-blue-500 focus:ring-2;
12+
}
13+
14+
.input-label {
15+
@apply block mb-2 text-sm font-medium text-gray-900;
16+
}
17+
18+
.checkbox-base {
19+
@apply w-4 h-4 text-blue-600 bg-gray-100 border border-gray-300 rounded-sm focus:ring-blue-500;
20+
21+
}
22+
}

assets/scss/inspect-fileset.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
@tailwind base;
2+
@tailwind components;
3+
@tailwind utilities;
4+
5+
@import 'components/inputs.scss';
6+
@import 'components/buttons.scss';

assets/static/css/dif.css

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@ label:not(.button)
88
display: block;
99
}
1010

11+
.ui-checkboxradio-label {
12+
font-weight: normal!important;
13+
}
14+
1115
.choice-label label {
1216
font-weight: normal;
1317
display: inline;

0 commit comments

Comments
 (0)