Commit Graph

9633 Commits

Author SHA1 Message Date
Carlo Costino
4bf6af4e45 Merge pull request #1480 from GSA/1464-switch-to-the-new-withnav_template
Switch to the new withnav_template
2024-05-31 10:28:01 -04:00
Beverly Nguyen
d739324d57 moved flash_message 2024-05-17 15:17:25 -07:00
Carlo Costino
3caf1e1631 Merge pull request #1539 from GSA/testing-chart.js
Installing chart.js
2024-05-17 18:16:28 -04:00
Beverly Nguyen
868edd3c28 Merge branch 'main' into 1464-switch-to-the-new-withnav_template 2024-05-17 15:12:36 -07:00
Beverly Nguyen
f91756d2c3 moved script to base.html 2024-05-17 15:07:05 -07:00
Carlo Costino
1b6741d0e5 Merge pull request #1543 from GSA/notify-admin-1396
Exception Investigation: app.notify_client:InviteTokenError
2024-05-17 17:43:06 -04:00
Carlo Costino
fe9e25ba6f Merge pull request #1542 from GSA/add-utils
Localize notification_utils to the admin
2024-05-17 17:26:58 -04:00
Beverly Nguyen
90d3dde6b5 Merge branch 'main' into testing-chart.js 2024-05-17 11:26:45 -07:00
Beverly Nguyen
ff1b60cc89 Merge branch 'main' into 1464-switch-to-the-new-withnav_template 2024-05-17 11:20:55 -07:00
Beverly Nguyen
68168a85a1 Merge branch 'main' into testing-chart.js 2024-05-17 11:14:14 -07:00
Carlo Costino
3a42aafad2 Merge pull request #1470 from GSA/1463-convert-basehtml-template-to-become-the-new-main-template
Switch to the new base.html template
2024-05-17 14:11:04 -04:00
Kenneth Kehl
e660541e9c Exception Investigation: app.notify_client:InviteTokenError 2024-05-16 09:11:11 -07:00
Carlo Costino
9a83ba7475 Localize notification_utils to the admin
This changeset pulls in all of the notification_utils code directly into the admin and removes it as an external dependency. We are doing this to cut down on operational maintenance of the project and will begin removing parts of it no longer needed for the admin.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
2024-05-16 10:37:37 -04:00
Beverly Nguyen
7ff0cec147 installing chart.js via npm 2024-05-15 15:43:49 -07:00
Beverly Nguyen
d4a46ae552 installing chart.js via npm 2024-05-15 15:40:15 -07:00
Beverly Nguyen
6855a6ebe4 installing chart.js via npm 2024-05-15 15:35:39 -07:00
Beverly Nguyen
5546de66c4 testing chart plain vanilla 2024-05-15 11:39:03 -07:00
Carlo Costino
b5c7a71215 Merge pull request #1523 from GSA/notify-admin-1501
Users are still asked to complete their profile when attempting to accept an invite for someone else
2024-05-10 17:28:43 -04:00
Kenneth Kehl
c578175e53 write new tests 2024-05-10 07:51:32 -07:00
Kenneth Kehl
11beff2541 get it working 2024-05-09 14:04:30 -07:00
Kenneth Kehl
7f72599401 notify-admin-1501 2024-05-09 13:08:34 -07:00
Kenneth Kehl
85ddd494b3 remove debug statement 2024-05-09 07:33:26 -07:00
Kenneth Kehl
26988d255f remove logged_in_elsewhere as per code review feedback 2024-05-08 12:45:01 -07:00
Kenneth Kehl
852c0e57c8 convert to test fixture 2024-05-08 11:30:51 -07: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
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
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
Kenneth Kehl
9ecbfb7e05 notify-admin-1459 2024-05-06 10:43:01 -07:00
Carlo Costino
580cdf8fad Merge branch 'main' into notify-admin-flask 2024-05-03 15:07: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
Carlo Costino
78ba8a5fc1 Merge branch 'main' into notify-admin-flask 2024-04-29 18:23:05 -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
4b37d81c16 Merge branch 'main' into notify-admin-flask 2024-04-29 15:43: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
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