darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-18 21:44:11 -04:00
Code Issues Packages Projects Releases Wiki Activity
15,098 Commits 59 Branches 61 Tags
0b2868a8d373cd9a67a31c7a9aa3130e351538d2
Commit Graph

5011 Commits

Author SHA1 Message Date
Jonathan Bobel
0b2868a8d3 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance 
# Conflicts:
#	app/main/views/dashboard.py
#	package-lock.json
#	package.json
 2024-07-04 13:25:03 -04:00
Carlo Costino
ffd935c4b6 Merge pull request #1629 from GSA/1256-bug-tour-steps-needs-to-be-adjusted-for-the-new-preview-page 
made changes/fixes to tour flow
 2024-07-03 14:37:07 -04:00
Carlo Costino
28efb2716b Merge pull request #1618 from GSA/1612-add-in-new-endpoint-for-weekly-by-user_id 
1612 add in new endpoint for week stats by user
 2024-07-03 14:21:49 -04:00
Beverly Nguyen
b8a4303a97 Merge branch 'main' into 1256-bug-tour-steps-needs-to-be-adjusted-for-the-new-preview-page 2024-07-02 16:02:29 -07:00
Beverly Nguyen
bd3e8e15c8 revised e2e 2024-07-02 15:55:10 -07:00
Beverly Nguyen
4fe3e54dd0 removed blank statements 2024-06-26 17:04:19 -07:00
Beverly Nguyen
abb011fcb6 removed print statements 2024-06-26 17:00:00 -07:00
Beverly Nguyen
83d3b1684f removed commented preview button 2024-06-26 16:59:12 -07:00
Beverly Nguyen
6e5ca94643 commented out get_by_text_ preview 2024-06-26 16:52:23 -07:00
Andrew Shumway
7cfa00197e Pull main 2024-06-25 09:05:52 -06:00
Beverly Nguyen
e72af9671b removed print 2024-06-24 16:54:31 -07:00
Beverly Nguyen
44baaf665a fixed testing 2024-06-24 15:33:48 -07:00
Andrew Shumway
7027cae3de pull main 2024-06-24 10:45:33 -06:00
Beverly Nguyen
fba6187fd9 Merge branch 'main' into 1612-add-in-new-endpoint-for-weekly-by-user_id 2024-06-20 19:37:43 -07:00
Kenneth Kehl
3b6ccc031a fix format? 2024-06-20 13:16:45 -07:00
Jonathan Bobel
6c44a297b8 Was failing because of package-lock mismatch 2024-06-18 09:35:03 -04:00
Jonathan Bobel
fc15ab6a9f Merge branch 'main' of https://github.com/GSA/notifications-admin into 1544-data-viz-total-message-allowance 
# Conflicts:
#	.ds.baseline
#	package-lock.json
#	poetry.lock
 2024-06-18 08:26:26 -04:00
Beverly Nguyen
30a3c9ce73 merge main 2024-06-17 17:39:57 -07:00
Beverly Nguyen
a1f2deda8f added test_fetch_daily_stats_by_user test 2024-06-17 17:32:24 -07:00
Beverly Nguyen
3594694de2 added fetch by user 2024-06-17 12:36:21 -07:00
Kenneth Kehl
16ad4a6c0c revamp PII masking 2024-06-17 11:13:03 -07:00
Kenneth Kehl
c3ae47e7f9 merge from main 2024-06-14 12:50:15 -07:00
Kenneth Kehl
4e8e1acb5b fix email masking algorithm 2024-06-13 10:17:47 -07:00
Beverly Nguyen
d028beda4f Removed comments 2024-06-11 16:29:31 -07:00
Beverly Nguyen
6be4f878e4 fixed end2end 2024-06-11 16:22:38 -07:00
Beverly Nguyen
5147072621 fixed e2e test 2024-06-11 15:46:36 -07:00
Beverly Nguyen
c8fb1b2f91 fixed import errors 2024-06-11 15:28:46 -07:00
Beverly Nguyen
7b8db70552 fixed testing 2024-06-11 14:01:40 -07:00
Kenneth Kehl
096658ab75 Need magic PII-free debugging method for Admin 2024-06-11 13:24:05 -07:00
Beverly Nguyen
89bd835cd8 update testing 2024-06-11 12:35:59 -07:00
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
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
Kenneth Kehl
63bd660403 code review feedback 2024-06-07 08:03:43 -07: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
Beverly Nguyen
c0b2c42473 removed imported unused style issue 2024-06-06 10:42:49 -07:00
Beverly Nguyen
f98cff8d40 fixed linting issues 2024-06-06 10:01:58 -07:00
Beverly Nguyen
61253963f7 added socketiotestclent 2024-06-06 00:48:08 -07: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
Carlo Costino
5fa2e77a71 Merge pull request #1570 from GSA/notify-admin-1041 
use moto to mock s3
 2024-05-31 16:12:06 -04:00
Kenneth Kehl
5f92f9a95d merge from main 2024-05-31 09:54:52 -07:00
Kenneth Kehl
2f366ff65c code review feedback 2024-05-31 09:41:36 -07:00