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

..

activity

When resizing the viewport for the header, I noticed other responsive issues and addressed them here

2024-03-05 09:51:25 -05:00

api

updated datetimes based on style guide

2024-03-18 15:10:26 -07:00

check

added format_datetime_scheduled_notification to formatters and removed unneccesary format changes

2024-04-09 12:52:45 -07:00

conversations

…

dashboard

Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations

2024-07-04 13:07:35 -04:00

features

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

find-services

…

find-users

…

guidance

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

jobs

add job status

2024-02-22 11:59:12 -08:00

manage-users

…

notifications

fixed testing

2024-06-24 15:33:48 -07:00

organizations

Merge branch 'main' into 1464-switch-to-the-new-withnav_template

2024-05-17 11:20:55 -07:00

platform-admin

moved flash_message

2024-05-17 15:17:25 -07:00

pricing

500 - Updating "Pricing" page content

2024-05-20 11:51:09 -04:00

service-settings

Removing instances of the login_gov_enabled flag as it will be live with this push to production

2024-04-17 11:49:47 -04:00

support

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

templates

810 - Content updates to link area in Send Message flow

2024-03-26 11:23:39 -04:00

user-profile

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

accessibility_statement.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

add-service-local.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

add-service.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

cancelled-invitation.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

change-email-continue.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

choose-account.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

documentation.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

edit-email-template.html

…

edit-sms-template.html

remove alert component

2023-12-17 22:17:49 -05:00

edit-user-permissions.html

…

email-link-interstitial.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

email-link-invalid.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

email-not-received.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

features.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

forgot-password.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

get-started.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

inbound-sms-admin.html

…

integration-testing.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

invite-user.html

…

manage-users.html

switched to withnav_template for org_template, settings template

2024-04-24 13:43:17 -07:00

message-status.html

Updated content, removed test no longer needed

2024-06-06 13:50:08 -04:00

new-password.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

notifications.html

Remove commented out code

2024-06-26 08:34:05 -06:00

password-reset-sent.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

performance.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

privacy.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

re-validate-email-sent.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

register-from-invite.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

register-from-org-invite.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

register.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

registration-continue.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

resend-email-verification.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

roadmap.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

security.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

send-test.html

…

send.html

…

service-settings.html

switched to withnav_template for org_template, settings template

2024-04-24 13:43:17 -07:00

set-up-your-profile.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

signedout.html

fixed css

2024-06-11 15:12:05 -07:00

signin.html

add back signin.html and removed login banner

2024-06-11 11:06:13 -07:00

temp-history.html

…

terms-of-use.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

text-not-received.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

trial-mode.html

Updated content, removed test no longer needed

2024-06-06 13:50:08 -04:00

two-factor-email.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

two-factor-sms.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

two-factor-webauthn.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

usage.html

1213 - Removed the Usage page and updated the Dashboard Landing page

2024-03-28 15:58:02 -04:00

user-already-invited.html

…

user-already-team-member.html

…

user-profile.html

switched to withnav_template for org_template, settings template

2024-04-24 13:43:17 -07:00

using-notify.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00

verification-not-received.html

replaced content_tempalte and withoutnav_template with base.html

2024-04-24 12:31:00 -07:00