12201 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erin Song	ca5dce2541	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into cb/3212-subissues	2025-04-01 23:35:10 -07:00
Erin Song	3194da558c	Add edit button to requesting entities in domain request summary	2025-04-01 23:34:55 -07:00
zandercymatics	74e4ae2e84	Merge pull request #3693 from cisagov/za/3662-uat-testing-issues ... #3662: Bundle of UAT testing issues - [ZA]	2025-03-28 10:03:19 -06:00
zandercymatics	7738e91aae	revert merge conflicts	2025-03-28 09:55:45 -06:00
zandercymatics	9b253bab06	Merge branch 'main' into za/3662-uat-testing-issues	2025-03-28 09:53:00 -06:00
Rachid Mrad	0eb4eab860	Merge pull request #3713 from cisagov/rjm/3666-500-bug-csv-export ... #3666: CSV export 500 bug - [AG - Farm Credit Administration]	2025-03-28 11:52:05 -04:00
zandercymatics	b5f9c26a62	Merge branch 'main' into za/3662-uat-testing-issues	2025-03-28 09:47:08 -06:00
Rachid Mrad	5a4fed6cc2	Merge branch 'main' into rjm/3666-500-bug-csv-export	2025-03-28 11:44:26 -04:00
Rachid Mrad	9566a73136	lint	2025-03-28 11:39:16 -04:00
Rachid Mrad	f765861b1d	debug statements	2025-03-28 11:16:29 -04:00
zandercymatics	d07fab387a	Merge pull request #3706 from cisagov/backup/3622-warn-org-admins ... #3622: Members page, warn org admins when they are modifying themselves - [BACKUP]	2025-03-28 07:58:35 -06:00
Rachid Mrad	b948aa6558	Fix similar id keys in convert_queryset_to_dict bug	2025-03-27 22:24:58 -04:00
Rachid Mrad	0d1137776c	Make sure we only look at INVITED	2025-03-27 17:01:36 -04:00
zandercymatics	2e1e1e1c20	Merge branch 'main' into za/3662-uat-testing-issues	2025-03-27 14:36:15 -06:00
zandercymatics	4df413fb1e	Merge branch 'main' into backup/3622-warn-org-admins	2025-03-27 14:35:51 -06:00
Rachid Mrad	6c32b26353	remove a debug html	2025-03-27 16:21:36 -04:00
zandercymatics	a2cba301a5	Update portfolio_member_permissions.html	2025-03-27 13:43:50 -06:00
Slim	24bef969a3	Merge pull request #3694 from cisagov/rh/3597-same-name-domain ... #3596: Changes to approving domain with same name - [RH]	2025-03-27 12:19:11 -07:00
zandercymatics	accda363cb	fix bad redirect url bug	2025-03-27 12:40:00 -06:00
Rebecca Hsieh	bb668d5ef1	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3597-same-name-domain	2025-03-27 11:21:10 -07:00
zandercymatics	7e8aad82f0	Fix bug with info dialog appearing on the wrong page	2025-03-27 12:10:18 -06:00
Rebecca Hsieh	a54eb92eee	Fix unit tests	2025-03-27 10:55:52 -07:00
Matt-Spence	51248c4f6e	Merge pull request #3682 from cisagov/ab/3599-permissions-tests ... #3599: New permissions tests - [AB]	2025-03-27 13:51:09 -04:00
Rebecca Hsieh	13c3051aa8	Fix ispendingdelete logic	2025-03-27 10:38:39 -07:00
matthewswspence	f12783bca6	linter fixes	2025-03-27 12:21:09 -05:00
zandercymatics	58af877ca1	Update portfolio-member-page.js	2025-03-27 11:19:28 -06:00
Matt-Spence	72c3f6c371	Merge branch 'main' into ab/3599-permissions-tests	2025-03-27 13:15:34 -04:00
zandercymatics	c0b68eebe8	Update portfolio-member-page.js	2025-03-27 11:07:28 -06:00
zandercymatics	beedd54e60	Merge branch 'main' into za/3662-uat-testing-issues	2025-03-27 10:47:41 -06:00
zandercymatics	e520986ae1	Merge pull request #3673 from cisagov/litterbox/3418-refactor-create-federal-portfolio ... #3418: Refactor create federal portfolio - [LITTERBOX]	2025-03-27 10:22:26 -06:00
matthewswspence	541008d9f1	review changes	2025-03-27 10:52:26 -05:00
matthewswspence	7c9ca52867	add extra handling	2025-03-27 10:49:14 -05:00
Matt-Spence	4e0a9c0b3d	Merge branch 'main' into ab/3599-permissions-tests	2025-03-27 11:32:44 -04:00
Rebecca Hsieh	5d53f5b9b2	Adding in the pendingDelete force state which will be removed	2025-03-27 07:36:43 -07:00
Rebecca Hsieh	848a1a2e57	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3597-same-name-domain	2025-03-27 07:36:22 -07:00
zandercymatics	0f1509fe73	Merge branch 'main' into backup/3622-warn-org-admins	2025-03-27 08:31:07 -06:00
zandercymatics	62cd68de90	Merge branch 'main' into za/3662-uat-testing-issues	2025-03-27 08:30:54 -06:00
zandercymatics	befdbc045e	Merge branch 'main' into litterbox/3418-refactor-create-federal-portfolio	2025-03-27 08:25:27 -06:00
Rachid Mrad	8114a0ebee	Fix subquery	2025-03-27 00:51:33 -04:00
dave-kennedy-ecs	146a5558aa	Merge pull request #3689 from cisagov/dk/3532-epplibwrapper-error ... #3532: EPP error message handling and retry on Registrar not logged in	2025-03-26 19:29:23 -04:00
David Kennedy	6927d9c5b7	Merge branch 'main' into dk/3532-epplibwrapper-error	2025-03-26 19:19:47 -04:00
David Kennedy	72f256e0b8	split message and apply to more scenarios	2025-03-26 18:32:59 -04:00
Rebecca Hsieh	3e98742a13	Have a try catch for registry error	2025-03-26 13:11:54 -07:00
zandercymatics	24333b9b1e	Merge branch 'main' into backup/3622-warn-org-admins	2025-03-26 13:33:54 -06:00
zandercymatics	7a42b913ed	lint	2025-03-26 13:11:04 -06:00
zandercymatics	3bf3c5a8a6	Merge branch 'za/3622-warn-org-admins' into backup/3622-warn-org-admins	2025-03-26 12:15:00 -06:00
zandercymatics	8ee3ba6190	unit tests and lint	2025-03-26 12:14:09 -06:00
zandercymatics	693ef37345	Merge branch 'main' into za/3662-uat-testing-issues	2025-03-26 11:26:26 -06:00
zandercymatics	692ed7d358	Merge pull request #3672 from cisagov/hotgov/3585-update-existing-public-contacts ... #3585 / #3640: script to update existing public contacts and add search bar and columns to dja tables - [HOTGOV]	2025-03-26 11:23:21 -06:00
zandercymatics	6768caa90e	Update update_default_public_contacts.py	2025-03-26 11:12:13 -06:00