darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-04-21 17:50:50 -04:00
Code Issues Packages Projects Releases Wiki Activity
15,347 Commits 49 Branches 59 Tags
28bc4befbef2f2e85caf48de5248e3065b28777c
Commit Graph

4569 Commits

Author SHA1 Message Date
Cliff Hill
6b8be20ed2 Black & isort. 
Signed-off-by: Cliff Hill <clifford.hill@gsa.gov>
 2024-08-02 14:50:52 -04:00
Beverly Nguyen
da33213730 Merge branch 'main' into 1484-dashboard-visualizations 2024-08-01 15:42:44 -07:00
Carlo Costino
da34acaf76 Merge pull request #1743 from GSA/1677-user-story-view-table-of-all-jobs-sent-with-my-service 
new activity page
 2024-08-01 15:00:38 -04:00
Jonathan Bobel
cfc65d20c3 Too many blank lines? 2024-07-31 11:54:45 -04:00
Jonathan Bobel
634f3f9643 Removing a print command 2024-07-31 11:34:42 -04:00
Jonathan Bobel
71cca74779 Updates to dashboard and py tests for dashboard 2024-07-31 11:34:19 -04:00
Jonathan Bobel
6a5b033700 Needed to wrap this line 2024-07-30 14:35:30 -04:00
Jonathan Bobel
4df7eb57d7 Adjusting tests 2024-07-30 14:24:02 -04:00
Jonathan Bobel
1912ffbbcf Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 
# Conflicts:
#	app/assets/sass/uswds/_uswds-theme-custom-styles.scss
#	app/templates/views/dashboard/dashboard.html
#	gulpfile.js
#	tests/app/main/views/test_dashboard.py
 2024-07-30 10:45:53 -04:00
Beverly Nguyen
8461c6156b created testing for activity page 2024-07-25 17:09:17 -07:00
Beverly Nguyen
b37b95cdcf Merge branch 'main' into 1677-user-story-view-table-of-all-jobs-sent-with-my-service 2024-07-25 11:59:53 -07:00
Beverly Nguyen
a8ce0be98b test_nav 2024-07-25 11:59:42 -07:00
Beverly Nguyen
2daaa6dd38 Fixed KeyError on processing_finished and removed notification api call 2024-07-24 15:03:51 -07:00
Jonathan Bobel
5b1516bdd1 Another test update 2024-07-23 15:27:03 -04:00
Jonathan Bobel
3dcc438542 Adjusting some tests 2024-07-23 14:58:13 -04:00
Jonathan Bobel
a0e64304d6 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-07-23 11:54:00 -04:00
Jonathan Bobel
4af04ff183 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 
# Conflicts:
#	package-lock.json
#	package.json
 2024-07-23 11:39:49 -04:00
Kenneth Kehl
9af1d922d3 merge from main 2024-07-23 07:20:05 -07:00
Jonathan Bobel
b718fbf791 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-07-17 11:24:00 -04:00
Jonathan Bobel
ba2b5fea37 Merge branch '1544-data-viz-total-message-allowance' into 1484-dashboard-visualizations 
# Conflicts:
#	app/assets/sass/uswds/_data-visualization.scss
#	app/assets/sass/uswds/styles.scss
#	app/templates/views/dashboard/dashboard.html
#	app/templates/views/dashboard/template-statistics.html
#	gulpfile.js
#	package-lock.json
 2024-07-17 11:23:53 -04:00
Kenneth Kehl
bf556eb408 make settings button invisible if you don't have permission to manage settings 2024-07-16 13:01:12 -07:00
Kenneth Kehl
8489fb9e61 update flake8-pytest-style-plugin 2024-07-15 08:07:18 -07:00
Jonathan Bobel
d301502957 JS cleanrup 
Table styles and updates
Removing chart.js
 2024-07-11 12:59:14 -04:00
Kenneth Kehl
058a999ed0 ugh 2024-07-11 09:38:32 -07:00
Jonathan Bobel
7f288598ba Deleting chart.js 
Updates to the dashboard html
Test updates
 2024-07-10 10:13:24 -04:00
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
Jonathan Bobel
74f4d730a8 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 
# Conflicts:
#	app/main/views/dashboard.py
#	app/templates/views/dashboard/dashboard.html
#	package-lock.json
#	package.json
 2024-07-04 13:07:35 -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
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
Beverly Nguyen
6be4f878e4 fixed end2end 2024-06-11 16:22:38 -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
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
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