7667 commits

Author	SHA1	Message	Date
Rachid Mrad	b1dd91f773	add check for original_obj.requested_domain is not None	2024-10-08 12:56:46 -04:00
Rachid Mrad	79b904e3be	Update src/registrar/tests/test_admin_request.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-10-08 12:54:50 -04:00
Rachid Mrad	c0fcfd7c44	put back accidentally deleted tests	2024-10-08 12:54:33 -04:00
David Kennedy	d9a79cabad	test models	2024-10-08 12:52:14 -04:00
Erin Song	2059c9fc0c	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/2729-domain-manager-updates	2024-10-08 09:42:21 -07:00
CocoByte	ae197ab3ed	Cleanup & slight fix for other permission checks	2024-10-07 21:40:58 -06:00
CocoByte	c3ab816386	Cleanup	2024-10-07 17:41:42 -06:00
CocoByte	61e7b13df6	Fixed multiple portfolio error check	2024-10-07 17:41:16 -06:00
asaki222	22d0833be2	added back things i changed by accident	2024-10-07 19:17:29 -04:00
asaki222	1aaefde0c4	moved domain name into separate span	2024-10-07 19:15:59 -04:00
asaki222	aa5690e894	added class name	2024-10-07 18:42:35 -04:00
asaki222	39bba36494	edited css for modal	2024-10-07 18:25:25 -04:00
Rachid Mrad	42a25b0d68	move the logic from templates into the views when testing for permissions	2024-10-07 18:16:13 -04:00
Rebecca H.	286cf8e417	Merge pull request #2878 from cisagov/rh/2592-domain-request-export ... #2592: Domain Request CSV Export - [RH]	2024-10-07 14:24:23 -07:00
Rebecca Hsieh	9c4638492b	Remove print statements	2024-10-07 14:19:25 -07:00
Rebecca Hsieh	b331011499	Print statements	2024-10-07 14:17:45 -07:00
David Kennedy	91355dc7a4	Assigned domains for portfolio invitations	2024-10-07 16:27:11 -04:00
David Kennedy	5c4705d417	Merge branch 'dk/2789-member-page' of https://github.com/cisagov/manage.get.gov into dk/2789-member-page	2024-10-07 15:20:56 -04:00
David Kennedy	15db31b3dc	assigned domains	2024-10-07 15:16:40 -04:00
Rachid Mrad	390324747e	merge	2024-10-07 15:08:25 -04:00
Rachid Mrad	cf39c7cc68	3 dot menu	2024-10-07 15:07:32 -04:00
asaki222	70caf535c2	added line	2024-10-07 15:04:00 -04:00
matthewswspence	491ce93b14	linter issues	2024-10-07 12:35:19 -05:00
matthewswspence	ac02e8cb81	Merge remote-tracking branch 'origin/main' into ms/2307-send-notification-emails	2024-10-07 12:21:08 -05:00
David Kennedy	58002de5e0	updated model	2024-10-07 13:18:13 -04:00
matthewswspence	1468ee6c73	Merge branch 'ms/2307-send-notification-emails' of https://github.com/cisagov/manage.get.gov into ms/2307-send-notification-emails	2024-10-07 12:16:40 -05:00
matthewswspence	7646c91691	design review changes	2024-10-07 12:16:21 -05:00
David Kennedy	57c89497b2	formatting of last active date	2024-10-07 12:52:42 -04:00
asaki222	da3d7d1c54	added new line because wrap is breaking up the word for	2024-10-07 12:30:01 -04:00
asaki222	249668527b	reverted changes	2024-10-07 11:31:57 -04:00
zandercymatics	5fc8d0d7e1	Merge branch 'main' into hotgov/2355-rejection-reason-emails	2024-10-07 09:17:12 -06:00
asaki222	33936e5bb3	add css styling	2024-10-07 11:09:05 -04:00
zandercymatics	878b22232e	Update domain_request.py	2024-10-07 09:02:49 -06:00
zandercymatics	36e2e6cc31	Fix tests	2024-10-07 08:41:08 -06:00
asaki222	561a88494c	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into ad/2828-domain-name-in-modal	2024-10-07 09:59:02 -04:00
Alysia Broddrick	482b456417	Merge pull request #2904 from cisagov/new-dev-sandbox-el ... #2762: New dev sandbox el [no sandbox needed]	2024-10-04 16:24:30 -07:00
asaki222	e068279108	fixed formatted	2024-10-04 17:58:17 -04:00
Matt-Spence	07d640dddc	Update src/registrar/templates/emails/update_to_approved_domain.txt ... Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>	2024-10-04 16:45:09 -05:00
Matt-Spence	83051ae623	Update src/registrar/templates/emails/update_to_approved_domain.txt ... Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>	2024-10-04 16:45:02 -05:00
Matt-Spence	35ea584a8f	Update src/registrar/templates/emails/update_to_approved_domain.txt ... Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>	2024-10-04 16:44:54 -05:00
Matt-Spence	aeebe8c997	Update src/registrar/templates/emails/update_to_approved_domain.txt ... Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>	2024-10-04 16:44:42 -05:00
Matt-Spence	4c3d29399d	Update src/registrar/templates/emails/update_to_approved_domain.txt ... Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>	2024-10-04 16:44:26 -05:00
Matt-Spence	96d9fcd252	Update src/registrar/templates/domain_users.html ... Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>	2024-10-04 16:44:02 -05:00
zandercymatics	d6d63127d0	Cleanup PortfolioDomainRequestWizard	2024-10-04 15:20:47 -06:00
zandercymatics	221e236775	Be explicit when swapping between enum / portfolio types ... Centralizes all config options at the start of the class	2024-10-04 15:13:21 -06:00
asaki222	9fed794521	fixed text in domain request py file	2024-10-04 17:10:19 -04:00
asaki222	d86a676f4f	trying it via styling	2024-10-04 16:30:11 -04:00
Rachid Mrad	9a28c8c404	wip member edit ui	2024-10-04 16:21:59 -04:00
zandercymatics	9a2e031979	Update src/registrar/views/domain_request.py	2024-10-04 13:54:52 -06:00
zandercymatics	0b7818bc7b	Fix linting issue	2024-10-04 13:33:13 -06:00