Commit Graph

14839 Commits

Author SHA1 Message Date
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
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
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
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
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
Carlo Costino
f5f5d0359c Remove E2E environment variables from the manifest
This changeset removes the E2E environment variables from the admin manifest file.  While these might be needed on the API side to ensure that they are exposed and able to be used in the staging environment, we do not need them to be enabled for the admin app; they should only be present in the GitHub Actions that are run in a PR, and the .github/workflows/checks.yml file takes care of that and injects them directly into the container environment that the end-to-end tests run in.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
2024-04-23 19:43:56 -04:00
Beverly Nguyen
2c0a4f16f2 fixed testing 2024-04-23 16:23:31 -07:00
Beverly Nguyen
d47fbb8eb7 switched base.html in 2024-04-23 14:58:44 -07:00
Carlo Costino
27117d8983 Merge pull request #1466 from GSA/1155-remove-expired-invites
Removed canceled users from displaying in dashboard
2024-04-23 12:44:59 -04:00
Anastasia Gradova
682a798dcd Updated test cases for canceled users 2024-04-22 16:09:25 -06:00
Anastasia Gradova
dc97170956 Removed canceled users from displaying in
dashboard
2024-04-22 14:00:29 -06:00
Andrew Shumway
98f12980ad poetry lock 2024-04-22 10:48:46 -06:00
Andrew Shumway
2d3dbbc532 Merge branch 'main' of https://github.com/GSA/notifications-admin 2024-04-22 10:44:17 -06:00
Carlo Costino
c9e5e2451d Merge pull request #1462 from GSA/notify-admin-1447
fix service invite flow and skip tests for now
2024-04-22 12:27:21 -04:00
Kenneth Kehl
410256821e remove misleading comment 2024-04-19 14:39:52 -07:00
Kenneth Kehl
fe7ad71edf remove need to double down on json.loads 2024-04-19 14:11:32 -07:00
Kenneth Kehl
5b97f33831 fix flow and skip tests for now 2024-04-19 13:53:32 -07:00
Carlo Costino
dc24391d31 Merge pull request #1418 from GSA/1416-combine-withnav_templatehtml-and-org_templatehtml
revised withnav_templates to include org_template
2024-04-19 16:51:27 -04:00
Carlo Costino
8e7cc19bfb Merge pull request #1435 from GSA/e2e-test-invite-to-service
E2e test invite to service
2024-04-19 16:39:32 -04:00
Carlo Costino
76e8487213 Merge pull request #1433 from GSA/notify-admin-1157a
add e2e variables to manifest
2024-04-19 16:21:10 -04:00
Andrew Shumway
4d015eb2c1 format 2024-04-19 13:56:59 -06:00
Andrew Shumway
96f3e231d7 format 2024-04-19 13:52:45 -06:00
Andrew Shumway
c5e103338d Merge branch 'main' of https://github.com/GSA/notifications-admin into e2e-test-invite-to-service 2024-04-19 13:10:26 -06:00
Andrew Shumway
a748159d22 Remove steps to pass in github 2024-04-19 13:10:09 -06:00