Commit Graph

10 Commits

Author SHA1 Message Date
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
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
Jonathan Bobel
f6e7402be9 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations
# Conflicts:
#	app/templates/new/components/head.html
2024-05-29 15:04:22 -04:00
Beverly Nguyen
f91756d2c3 moved script to base.html 2024-05-17 15:07:05 -07: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
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