8593 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
CocoByte	d1f3f0efb1	Revert "resolved merge conflict" ... This reverts commit 85be976ee4, reversing changes made to bd018e14ab.	2024-10-09 14:08:05 -06:00
CocoByte	85be976ee4	resolved merge conflict	2024-10-08 16:01:19 -06:00
CocoByte	bd018e14ab	cleanup	2024-10-08 15:53:31 -06:00
CocoByte	23e99c054d	added unit test	2024-10-08 15:53:04 -06:00
Rachid Mrad	f299dc822c	Merge pull request #2879 from cisagov/rjm/1846-copy-email-btn ... #2846: Fix bugs with the copy email button UI plus code cleanup - [RJM]	2024-10-08 16:45:17 -04:00
Rachid Mrad	50abaab52d	cleanup	2024-10-08 16:35:37 -04:00
Rachid Mrad	81df3974ff	merge	2024-10-08 16:08:06 -04:00
Rachid Mrad	935cafb88a	Merge pull request #2888 from cisagov/rjm/1263-approved-domain-error ... #1263 Request error: Already approved domain - [RJM]	2024-10-08 16:05:32 -04:00
Rachid Mrad	99c112afd0	Update src/registrar/admin.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-10-08 12:57:04 -04:00
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
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
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
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
Alysia Broddrick	e5d648a087	added infra for el	2024-10-04 14:23:37 -07:00
zandercymatics	14e8150326	Merge pull request #2842 from cisagov/za/2402-design-review ... #2402: Design Review for Analyst Portfolio View - [ZA] - MIGRATION	2024-10-04 10:29:04 -06:00
zandercymatics	a219521e9a	Merge branch 'main' into za/2402-design-review	2024-10-04 10:23:19 -06:00
Alysia Broddrick	195daaeaa9	add infrastructure for for el	2024-10-03 12:38:54 -07:00
Rebecca Hsieh	ce6ad59f7d	Remove unused ENUM test	2024-10-03 12:20:30 -07:00
Rachid Mrad	de4f2fccaf	Merge pull request #2892 from cisagov/bob/2225-disabled-styles-2 ... #2225: Match disabled styles with USWDS - [BOB]	2024-10-03 15:12:22 -04:00
zandercymatics	8d0c1ba6bf	fix migrations (merge conflict	2024-10-03 13:06:12 -06:00
Rebecca Hsieh	ccbbc56b64	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/2592-domain-request-export	2024-10-03 12:05:34 -07:00
Rebecca Hsieh	2fd159ccaa	Add in flag for org requests	2024-10-03 11:57:55 -07:00
zandercymatics	2f8408e875	Merge branch 'main' into za/2402-design-review	2024-10-03 12:54:52 -06:00
Rebecca Hsieh	9650258038	Remove print statement	2024-10-03 11:53:38 -07:00
Rebecca Hsieh	3ea9802ef1	Debug attr	2024-10-03 11:41:53 -07:00
Rebecca Hsieh	28ce6698da	Hide exporting for domain request for non org	2024-10-03 11:25:27 -07:00
CuriousX	9aa3504426	Merge pull request #2837 from cisagov/nl/2725-member-management-page ... #2725: member management page - [NL]	2024-10-03 10:19:50 -06:00
Rachid Mrad	3f11dd084e	Hide copy button if no email on other contact	2024-10-03 12:06:49 -04:00
Rachid Mrad	8d8b592e79	remove Remove our custom disabled form style	2024-10-02 22:38:35 -04:00
Rachid Mrad	9b091263d4	cleanup	2024-10-02 22:12:46 -04:00
Rachid Mrad	c878e7aebb	fix copy button on other contacts and more cleanup	2024-10-02 21:58:35 -04:00
Rachid Mrad	4a06a94f46	admin redundant test	2024-10-02 21:37:36 -04:00
Rachid Mrad	b51b20a075	cleanup	2024-10-02 19:34:36 -04:00
Rachid Mrad	98b417bc44	lint	2024-10-02 19:25:31 -04:00
Rachid Mrad	d723825b12	cleanup	2024-10-02 19:17:11 -04:00
Rachid Mrad	6dd4132a29	cleanup	2024-10-02 18:14:10 -04:00
Rachid Mrad	0ea37d7113	unit tests	2024-10-02 18:12:40 -04:00
Rachid Mrad	4df509c4f7	working on tests	2024-10-02 17:49:57 -04:00
Rachid Mrad	8aa919cc65	merge main	2024-10-02 16:31:56 -04:00
Rachid Mrad	f95fc0bf69	cleanup	2024-10-02 16:31:14 -04:00
Rachid Mrad	6162a26ee9	cleanup admin code	2024-10-02 16:21:34 -04:00
zandercymatics	76473e2ae4	fix test	2024-10-02 14:02:58 -06:00
Rebecca H.	2f009ee15c	Merge pull request #2860 from cisagov/rh/2709-import-export ... #2709: Update import export instructions	2024-10-02 11:10:13 -07:00
zandercymatics	d4512977c5	lint	2024-10-02 11:35:49 -06:00
Rebecca Hsieh	36007cc693	Update test and logic	2024-10-02 10:34:19 -07:00
Rachid Mrad	f52c36ef12	layout revisions	2024-10-02 12:34:57 -04:00