Commit Graph

17041 Commits

Author SHA1 Message Date
Andrew Shumway
35e27ff25a Merge main 2024-06-10 10:44:09 -06:00
Andrew Shumway
a401562735 Add report options 1/3/5-day 2024-06-10 10:15:22 -06:00
Jonathan Bobel
468f6c9fc6 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-06-10 11:07:41 -04:00
Jonathan Bobel
9af16b443a Small styling change for the table scroll 2024-06-10 10:31:43 -04:00
Jonathan Bobel
abcbb0eb7a This was a testing experiment, no longer needed 2024-06-10 10:23:35 -04:00
Jonathan Bobel
9d22b99e9b Updates after merge 2024-06-10 10:20:33 -04:00
Jonathan Bobel
9b84f59bf8 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance 2024-06-10 10:02:24 -04:00
Carlo Costino
749935e94d Merge pull request #1595 from GSA/notify-admin-1588
Add debug for admin #1588
2024-06-08 00:44:55 -04:00
Carlo Costino
9f9614d292 Merge pull request #1596 from GSA/1305-delivery-status-content-update
Delivery status content updates
2024-06-08 00:33:34 -04:00
Jonathan Bobel
b9beb50313 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance
# Conflicts:
#	.ds.baseline
#	app/assets/javascripts/chartDashboard.js
#	app/main/views/dashboard.py
2024-06-07 16:51:32 -04:00
Kenneth Kehl
da96edbfcd fix set and get in redis_client 2024-06-07 09:07:42 -07:00
Jonathan Bobel
726e8db5b2 Merge remote-tracking branch 'origin' into 1484-dashboard-visualizations 2024-06-07 11:07:12 -04:00
Kenneth Kehl
63bd660403 code review feedback 2024-06-07 08:03:43 -07:00
Jonathan Bobel
b759f8a87f Adding js to node_modules instead of the head 2024-06-07 09:44:30 -04:00
Carlo Costino
4321e31377 Merge pull request #1558 from GSA/socketIO
Installing socketIO and connecting new dashboard API endpoints
2024-06-06 17:44:58 -04:00
Jonathan Bobel
ae56ea1482 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance 2024-06-06 15:01:14 -04:00
Beverly Nguyen
33f8f4c000 fix import sort 2024-06-06 10:50:24 -07:00
Jonathan Bobel
934f8927c6 Updated content, removed test no longer needed 2024-06-06 13:50:08 -04:00
Kenneth Kehl
83f5b6f0ab add comment 2024-06-06 10:43:41 -07:00
Beverly Nguyen
c0b2c42473 removed imported unused style issue 2024-06-06 10:42:49 -07:00
Beverly Nguyen
e413f8c640 added sampleChartDashboard.js 2024-06-06 10:05:36 -07:00
Beverly Nguyen
f98cff8d40 fixed linting issues 2024-06-06 10:01:58 -07:00
Kenneth Kehl
adc89a8326 merge from main 2024-06-06 09:35:07 -07:00
Kenneth Kehl
82690d6e3d add debug for user issue 2024-06-06 09:34:49 -07:00
Beverly Nguyen
ae7a14f3f2 fixed js chart referenced 2024-06-06 01:10:09 -07:00
Beverly Nguyen
61253963f7 added socketiotestclent 2024-06-06 00:48:08 -07:00
Beverly Nguyen
9d3dc047ea added chartjs to path in gulp 2024-06-05 15:03:19 -07:00
Beverly Nguyen
e5a9eed626 installing socketio 2024-06-05 14:56:22 -07:00
Carlo Costino
834c6df7dc Merge pull request #1593 from GSA/update-deps-6-5-24
Update Python dependencies - 6/5/2024
2024-06-05 17:03:20 -04:00
Carlo Costino
43d67a4821 Update Python dependencies - 6/5/2024
This changeset updates several Python dependencies flagged by Dependabot.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
2024-06-05 16:55:17 -04:00
Jonathan Bobel
1f84db7861 This is covered in the js test now 2024-06-05 12:08:52 -04:00
Jonathan Bobel
568400941b Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance
# Conflicts:
#	poetry.lock
2024-06-05 11:25:47 -04:00
Jonathan Bobel
c02c9152d8 Writing tests for chartDashboard.js 2024-06-05 11:25:15 -04:00
Beverly Nguyen
fed2aff43c cleaned up code 2024-06-04 16:52:32 -07:00
Beverly Nguyen
0a4cf290ac added flask-socketio 2024-06-04 16:33:55 -07:00
Beverly Nguyen
fec6c2ff72 removed comments 2024-06-04 16:27:35 -07:00
Jonathan Bobel
30b31d61b6 adding chart.js 2024-06-04 16:46:54 -04:00
Beverly Nguyen
7a9d260717 fix testing 2024-06-03 15:34:43 -07:00
Andrew Shumway
f9169fcbcb poetry lock 2024-06-03 15:55:37 -06:00
Carlo Costino
44a3c9a13b Merge pull request #1585 from GSA/update-deps-6-3-24
Update Python dependencies - 6/3/24
2024-06-03 17:31:23 -04:00
Beverly Nguyen
8554df58f8 cleared up style checks 2024-06-03 13:51:59 -07:00
Beverly Nguyen
d3bee61742 cleared up style checks 2024-06-03 13:45:36 -07:00
Beverly Nguyen
89f19bb63d cleared up style checks 2024-06-03 13:35:30 -07:00
Beverly Nguyen
d12b798bba removed sending status 2024-06-03 13:17:31 -07:00
Jonathan Bobel
ae78e5868a Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-06-03 15:52:04 -04:00
Beverly Nguyen
2e41b752f5 Remove .ds.baseline from repository 2024-06-03 12:50:05 -07:00
Beverly Nguyen
72e82c818b added socket.io.min.js 2024-06-03 11:39:02 -07:00
Beverly Nguyen
4ebd5734d6 removed socket.js 2024-06-03 11:32:56 -07:00
Beverly Nguyen
8152985f9b Merge branch 'main' into socketIO 2024-06-03 09:52:41 -07:00
Carlo Costino
f0fcb8f21d Update Python dependencies - 6/3/24
This changeset updates several Python dependencies to stay on top of Dependabot alerts.

Signed-off-by: Carlo Costino <carlo.costino@gsa.gov>
2024-06-03 11:03:29 -04:00