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.

Sign up for GitHub

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

Latest from develop #562

Merged
merged 37 commits into from
Oct 17, 2023
Merged

Latest from develop #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
9e20e5e
FOIA-389: FOIA FBI webform updates for the first pass.
brockfanning Aug 7, 2023
51f02e7
FOIA-389: More updates and fixes to FBI form.
brockfanning Aug 15, 2023
2f7c605
FOIA-417: webform updates Sanitize filename.
jhuang0427 Aug 25, 2023
d738f17
Merge pull request #541 from jhuang0427/webform-update-417
brockfanning Aug 25, 2023
952f63d
FOIA-0: Disable views_ui module.
brockfanning Aug 25, 2023
36036d1
Merge branch 'develop' into foia-ws-390-fbi-webform
brockfanning Aug 25, 2023
4c1bfe3
FOIA-389: Citizen element.
brockfanning Aug 25, 2023
96ee8d8
FOIA-389: Some validation updates.
brockfanning Aug 28, 2023
01dcc4c
FOIA-000: PHP update 8.1 completed.
nubasit Aug 30, 2023
28a716a
FOIA-000: Additional files for PHP update 8.1 completed.
nubasit Aug 30, 2023
0a35ecd
Merge pull request #544 from nubasit/FOIA-000-php81
ameshkin Aug 31, 2023
69520ae
Merge branch 'develop' into foia-0-disable-views-ui
ameshkin Sep 5, 2023
ffad4d0
Merge branch 'develop' into foia-ws-389-fbi-webform
ameshkin Sep 5, 2023
b57cd43
Merge pull request #539 from brockfanning/foia-ws-389-fbi-webform
brockfanning Sep 5, 2023
7e332d9
Merge branch 'develop' into foia-0-disable-views-ui
brockfanning Sep 5, 2023
7d2a6bb
Merge pull request #542 from brockfanning/foia-0-disable-views-ui
ameshkin Sep 5, 2023
c5931b6
FOIA-431: Modify the agency component field to commonly_requested_rec…
nubasit Sep 7, 2023
d9fb43e
Merge pull request #545 from nubasit/FOIA-431
ameshkin Sep 12, 2023
1302b44
FOIA-389: Signature fields for FBI form.
brockfanning Sep 13, 2023
d923b81
Merge pull request #549 from brockfanning/foia-389-fbi-signature-fields
brockfanning Sep 13, 2023
470fb5b
Trigger builds
brockfanning Sep 13, 2023
45f4c3e
Merge pull request #550 from usdoj/brockfanning-patch-1
brockfanning Sep 13, 2023
b4e68db
FOIA-389: More tweaks to FBI form.
brockfanning Sep 18, 2023
e341db0
Merge pull request #553 from brockfanning/foia-389-more-fbi-form-tweaks
brockfanning Sep 18, 2023
231b341
FOIA-389: More logic tweaks.
brockfanning Sep 21, 2023
9350c09
FOIA-389: More tweaks.
brockfanning Sep 21, 2023
30b9ff8
Merge pull request #554 from brockfanning/foia-389-more-fbi-form-twea…
brockfanning Sep 21, 2023
33d70f6
FOIA-389: Allow for non-US state/province field.
brockfanning Sep 27, 2023
097b6cf
FOIA-389: More tweaks for launching the FBI form.
brockfanning Sep 27, 2023
bf082ba
FOIA-389: Default value country fix.
brockfanning Sep 27, 2023
eefcfb2
FOIA-389: More fixes.
brockfanning Sep 28, 2023
a56131a
FOIA-389: Require address field.
brockfanning Sep 29, 2023
5b7e0dc
FOIA-389: Yes/no in options.
brockfanning Sep 29, 2023
60ab9c1
Merge pull request #555 from brockfanning/foia-389-fbi-launch-tweaks
brockfanning Oct 4, 2023
9536c71
FOIA-238: WS-238 Updated codebase with new button to make clearing an…
ameshkin Oct 4, 2023
708d3a2
FOIA-440: Updating drupal to 9.5.11 for security update.
ameshkin Oct 10, 2023
0613fbd
Merge pull request #559 from ameshkin/FOIA-440-drupal-update-9-5-11
ameshkin Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .ddev/config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: foia-api
type: drupal9
docroot: docroot
php_version: "8.0"
php_version: "8.1"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
- name: Install SSH key
uses: webfactory/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-production.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
- name: Install SSH key
uses: webfactory/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
- name: Install SSH key
uses: webfactory/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy-to-uat.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
- name: Install SSH key
uses: webfactory/[email protected]
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test-pull-requests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.0'
php-version: '8.1'
- name: Set up ddev
uses: ddev/github-action-setup-ddev@v1
- name: Set up the site
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ As an alternative to Drupal VM, Docker can be used to spin up this project.

* [Issue queue](https://github.com/18F/beta.foia.gov/issues)
* [GitHub](https://github.com/usdoj/foia)

10 changes: 5 additions & 5 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"minimum-stability": "dev",
"prefer-stable": true,
"require": {
"php": ">=8.0",
"php": ">=8.1",
"ext-dom": "*",
"acquia/blt": "^13.4.0",
"acquia/blt-simplesamlphp": "^1.0",
Expand All @@ -25,9 +25,9 @@
"drupal/cog": "^1.15",
"drupal/config_split": "^1.7.0",
"drupal/core": "^9.5.8",
"drupal/core-composer-scaffold": "^9.5.8",
"drupal/core-project-message": "^9.5.8",
"drupal/core-recommended": "^9.5.8",
"drupal/core-composer-scaffold": "9.5.11",
"drupal/core-project-message": "9.5.11",
"drupal/core-recommended": "9.5.11",
"drupal/devel": "^5.0.2",
"drupal/entity_clone": "^2.0@beta",
"drupal/entity_embed": "^1.0",
Expand Down Expand Up @@ -206,7 +206,7 @@
"drupal/core-project-message": true
},
"platform": {
"php": "8.0.24"
"php": "8.1"
}
},
"autoload": {
Expand Down
Loading
Loading