Commit Graph

17572 Commits

Author SHA1 Message Date
Andrew Shumway
cdd71fa07d pull down main 2024-05-08 09:03:24 -06:00
Kenneth Kehl
1d9457f9a2 add debug statements 2024-05-07 14:36:21 -07:00
Kenneth Kehl
9c40a10900 cleanup 2024-05-07 13:58:59 -07:00
Carlo Costino
be177726ee Merge pull request #1517 from GSA/dep-updates
Update several dependencies from Dependabot
2024-05-07 16:09:18 -04:00
Kenneth Kehl
64aa45dcaa remove commented out code 2024-05-07 12:37:04 -07:00
Kenneth Kehl
125ad7a2f7 remove logged in elsewhere check 2024-05-07 11:11:12 -07:00
Carlo Costino
39b0a4ff52 Update several dependencies from Dependabot
This changeset updates a few dependencies that Dependabot flagged for updates. We cannot merge the Dependabot PRs at the moment due to E2E test compatability issues.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
2024-05-07 09:56:34 -04:00
Beverly Nguyen
93d7ca4052 added pending and requested status to monthly stats dict 2024-05-06 17:23:38 -07:00
Kenneth Kehl
78e8dc95fe fix tests 2024-05-06 13:12:27 -07:00
Kenneth Kehl
0b30c9a83f merge from main 2024-05-06 12:15:57 -07:00
Carlo Costino
0de950d2a4 Merge pull request #1511 from GSA/flask-dep-updates
Updating several dependencies related to Flask upgrade
2024-05-06 15:01:21 -04:00
Kenneth Kehl
9ecbfb7e05 notify-admin-1459 2024-05-06 10:43:01 -07:00
Carlo Costino
5fe35b4497 Updating several dependencies related to Flask upgrade
Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
2024-05-06 13:02:02 -04:00
Carlo Costino
c100f1cd25 Merge pull request #1387 from GSA/notify-admin-flask
flask upgrade
2024-05-06 11:28:56 -04:00
Carlo Costino
580cdf8fad Merge branch 'main' into notify-admin-flask 2024-05-03 15:07:11 -04:00
Carlo Costino
a6b0a8df90 Merge pull request #1506 from GSA/1334-add-information-landing-page
1334 - Updating content for Eligible partners
2024-05-03 15:06:11 -04:00
Beverly Nguyen
065f1b7c15 removed comments on base.html 2024-05-03 10:58:06 -07:00
Jonathan Bobel
fb66531c44 1334 - Updating content for Eligible partners 2024-05-03 12:10:59 -04:00
Jonathan Bobel
afdc0ed58d 1484 - Dashboard visualizations 2024-05-03 11:10:41 -04:00
Anastasia Gradova
5f531f1f78 Updated filename string into db and UI display 2024-05-02 12:53:27 -06:00
Andrew Shumway
7108c5f1c8 pull main down 2024-04-30 10:06:49 -06:00
Carlo Costino
78ba8a5fc1 Merge branch 'main' into notify-admin-flask 2024-04-29 18:23:05 -04:00
Carlo Costino
a378a58686 Merge pull request #1497 from GSA/Remove/Clean-up-send_notification-redirect
cleaned up and removed from_job and notification_id from redirect
2024-04-29 18:22:27 -04:00
Beverly Nguyen
83481a8b28 cleaned up and removed from_job and notification_id from redirect, no longer needed 2024-04-29 14:25:13 -07:00
Carlo Costino
5dc23947e2 Updated utils to 0.5.1 release in prep for Flask upgrade
Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
2024-04-29 15:44:33 -04:00
Carlo Costino
4b37d81c16 Merge branch 'main' into notify-admin-flask 2024-04-29 15:43:12 -04:00
Kenneth Kehl
170527cfdf add API HOST NAME to workaround 2024-04-29 12:05:25 -07:00
Kenneth Kehl
7b570bfbed ugh 2024-04-29 11:35:33 -07:00
Kenneth Kehl
bc72288d4d workaround in conftest for pytest.ini overriding all our env variables 2024-04-29 11:06:25 -07:00
Kenneth Kehl
e50b4bb5f7 try overriding pytest.ini variables 2024-04-29 10:42:31 -07:00
Kenneth Kehl
32f1bb4f87 revert 2024-04-29 09:42:32 -07:00
Kenneth Kehl
594ad74006 remove ampersand 2024-04-29 09:31:58 -07:00
Kenneth Kehl
3b9664f220 more debug 2024-04-29 09:09:49 -07:00
Kenneth Kehl
9897385837 try switching env to development 2024-04-29 08:59:08 -07:00
Kenneth Kehl
4ec3bc5892 merge from main 2024-04-29 07:44:10 -07:00
Andrew Shumway
65899f6171 poetry lock 2024-04-26 10:15:44 -06:00
Andrew Shumway
bd633ddc98 Merge branch 'main' of https://github.com/GSA/notifications-admin 2024-04-25 15:27:31 -06:00
Carlo Costino
82279eb357 Merge pull request #1479 from GSA/fix_service_invites
fix service invites
04-26-2024
2024-04-25 17:07:12 -04:00
Kenneth Kehl
f0f0661f2a Update app/main/views/register.py
Co-authored-by: Carlo Costino <ccostino@users.noreply.github.com>
2024-04-25 14:00:28 -07:00
Kenneth Kehl
4818b7ce14 code review feedback 2024-04-25 13:48:14 -07:00
Kenneth Kehl
84180fd8e1 Update app/main/views/register.py
Co-authored-by: Carlo Costino <ccostino@users.noreply.github.com>
2024-04-25 13:39:21 -07:00
Beverly Nguyen
8366a4c772 fix testing 2024-04-24 16:12:54 -07:00
Beverly Nguyen
f734e45242 added comments 2024-04-24 13:56:07 -07:00
Beverly Nguyen
04f1f6244c fixed file name 2024-04-24 13:53:28 -07:00
Beverly Nguyen
3b82e136e0 switched to withnav_template for org_template, settings template 2024-04-24 13:43:17 -07:00
Beverly Nguyen
bc945c9420 replaced content_tempalte and withoutnav_template with base.html 2024-04-24 12:31:00 -07:00
samathad2023
2bcad264b8 urllib3 update 2024-04-24 12:11:33 -07:00
Kenneth Kehl
f7fe270171 fix service invites 2024-04-24 11:20:17 -07:00
Andrew Shumway
ff1956ce70 Merge branch 'main' of https://github.com/GSA/notifications-admin 2024-04-24 09:29:58 -06:00
Carlo Costino
0d04347ffd Merge pull request #1473 from GSA/remove-e2e-env-vars-from-manifest
Remove E2E environment variables from the manifest
2024-04-23 19:51:26 -04:00