11414 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
asaki222	98e5a29131	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into fix-for-naming-of-script	2025-02-14 13:12:24 -05:00
Rachid Mrad	73435a3512	Add member email as a section on domains review	2025-02-14 13:00:45 -05:00
Rachid Mrad	d328c86884	rename unsafeStripHtmlTags	2025-02-14 12:50:50 -05:00
Rachid Mrad	29c4dbd0ec	Fix race condition in member domains table	2025-02-14 12:49:02 -05:00
zandercymatics	27915e53af	Merge branch 'main' into za/3148-accessible-bar-graph	2025-02-14 10:36:13 -07:00
Slim	606ee7ca6f	Merge pull request #3511 from cisagov/rh/3389-env-emails ... #3389: Add env to emails - [RH]	2025-02-14 09:24:20 -08:00
Rebecca Hsieh	7d8249923e	Update comments	2025-02-14 09:17:28 -08:00
David Kennedy	c81c229be2	fixed test	2025-02-14 12:01:25 -05:00
Rebecca Hsieh	33bf1988f1	Fix placement of where email subject is edited	2025-02-14 08:28:50 -08:00
Rebecca Hsieh	881f57727d	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3389-env-emails	2025-02-14 08:06:52 -08:00
Rebecca Hsieh	8020bd6f74	Update for prefix to be in the subject dynamically	2025-02-14 08:02:47 -08:00
Matt-Spence	8322806724	Merge branch 'main' into ko/3392-fix-domain-deletion	2025-02-14 10:48:08 -05:00
Matt-Spence	1ca20dd421	Update domain.py	2025-02-14 09:47:46 -06:00
Matt-Spence	0106ffbf05	Update admin.py	2025-02-14 09:45:31 -06:00
Matt-Spence	f8a5b8e629	Update admin.py	2025-02-14 09:44:53 -06:00
lizpearl	283d746452	Merge pull request #3516 from cisagov/el/add-jaxon-to-fixtures ... [no ticket] Add Jaxon to fixtures [EL]	2025-02-14 07:42:32 -06:00
David Kennedy	986bcc2351	fixed date in email	2025-02-14 06:56:56 -05:00
Rachid Mrad	11a7288109	Fix unit test	2025-02-13 18:33:28 -05:00
Rachid Mrad	8d36dd67d5	Update copy on domain_users	2025-02-13 18:23:58 -05:00
Rachid Mrad	2bdbe4970d	Remove h2 on domains review	2025-02-13 18:21:26 -05:00
Rachid Mrad	0c154e537e	fix Clicking cancel on Member Access and Permissions page navigates back to the wrong user	2025-02-13 18:17:45 -05:00
Rachid Mrad	7e4a99fd33	Change pk to id	2025-02-13 17:53:19 -05:00
asaki222	ca4246040e	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into fix-for-naming-of-script	2025-02-13 17:35:46 -05:00
Rachid Mrad	85e13b0719	email tweaks	2025-02-13 17:30:37 -05:00
lizpearl	d28090a956	Merge branch 'main' into el/add-jaxon-to-fixtures	2025-02-13 16:25:48 -06:00
Rachid Mrad	5d9ce22fc2	cleanup	2025-02-13 16:53:02 -05:00
Rachid Mrad	3e3f670490	Fix unit tests	2025-02-13 15:40:40 -05:00
Rachid Mrad	75c2c27e0a	Domain assignments review page	2025-02-13 15:34:55 -05:00
Rachid Mrad	2506198c92	Sanitize domainName for table kebob	2025-02-13 15:16:52 -05:00
Rachid Mrad	6f97e438e3	Fix th background in regular td	2025-02-13 15:08:09 -05:00
Rachid Mrad	d819456c1f	Copy edit to domain assignment	2025-02-13 15:05:36 -05:00
Rachid Mrad	de808dc7f1	Fix unit tests	2025-02-13 14:49:21 -05:00
Rachid Mrad	95a3fd157b	Add a manager	2025-02-13 14:43:29 -05:00
Rachid Mrad	1b4f09ec76	Domain managers page	2025-02-13 14:36:47 -05:00
Rachid Mrad	34914b4da4	revert apostrophe work	2025-02-13 14:08:48 -05:00
Jaxon Silva	2c75a8dfbd	Update status_change_rejected.txt	2025-02-13 11:06:01 -08:00
Rachid Mrad	d64ebab978	Revert apostrophe work	2025-02-13 13:48:36 -05:00
Jaxon Silva	f7645228dd	Removed thank you text from ineligible states	2025-02-13 10:46:47 -08:00
Rachid Mrad	7dc1cb073d	Change Can't to Can’t in a bunch of error messages	2025-02-13 13:34:31 -05:00
Rebecca Hsieh	856b71b6ce	Add for transition domain inv email	2025-02-13 10:30:48 -08:00
Rebecca Hsieh	c737daa8fd	Add prefix and manage url to the action needed reasons templates	2025-02-13 10:28:49 -08:00
Rebecca Hsieh	9579779e6a	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3389-env-emails	2025-02-13 10:24:18 -08:00
asaki222	246a44d1be	Merge pull request #3510 from cisagov/gd/3443-launch-renewal-feature ... #3443 - Removed Domain renewal feature references - [GD]	2025-02-13 13:19:11 -05:00
Rachid Mrad	153e9ffa1a	adjust paddings on tables, portfolio	2025-02-13 12:40:14 -05:00
Rachid Mrad	d2baffdf45	merge main	2025-02-13 12:33:39 -05:00
asaki222	a928cc742c	updated changes	2025-02-13 12:18:55 -05:00
Rachid Mrad	6ce45d9906	apostrophe	2025-02-13 11:48:52 -05:00
Rachid Mrad	67fb336102	apostrophe	2025-02-13 11:47:26 -05:00
asaki222	71a9e9515d	updated the creds variable	2025-02-13 11:09:32 -05:00
asaki222	3245cded0e	updated naming for workflow	2025-02-13 10:58:40 -05:00