10991 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Rebecca Hsieh	14d77c676a	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3348-domain-dropdown	2025-02-11 12:52:53 -08:00
zandercymatics	3fc09a8f7c	Merge pull request #3478 from cisagov/za/3463-fix-analytics-breadcrumb ... #3463: Add breadcrumb to analytics page - [LITTERBOX]	2025-02-11 09:44:18 -07:00
zandercymatics	078c358330	Merge branch 'main' into za/3463-fix-analytics-breadcrumb	2025-02-11 09:33:43 -07:00
CuriousX	546217da73	Merge pull request #3444 from cisagov/nl/3075-action-td-adjustments ... #3075 Adjustments to action td on tables - [NL]	2025-02-10 16:49:44 -07:00
Rebecca Hsieh	663e34fd5b	Remove unused import for linting	2025-02-10 13:02:43 -08:00
Rebecca Hsieh	f0856a0844	Fix merge conflict	2025-02-10 12:59:24 -08:00
Rebecca Hsieh	898168f44f	Remove extraneous comment	2025-02-10 12:55:31 -08:00
Rebecca Hsieh	8464cf7bda	Fix spacing	2025-02-10 12:54:52 -08:00
Rebecca Hsieh	16e251c4fc	Fix logic and additional unit tests	2025-02-10 12:47:53 -08:00
CocoByte	8888a43f44	Adjustments from huddle	2025-02-10 13:16:31 -07:00
CuriousX	4238d064d3	Merge branch 'main' into nl/3075-action-td-adjustments	2025-02-10 10:06:58 -07:00
zandercymatics	d952f5250d	Merge branch 'main' into za/3463-fix-analytics-breadcrumb	2025-02-10 08:21:56 -07:00
Erin Song	303b74c458	Merge pull request #3423 from cisagov/es/3285-delete-manager-email ... 3285: Email all domain managers when a domain manager is removed [ES]	2025-02-07 09:57:15 -08:00
Erin Song	40f21b86ee	Remove unused library	2025-02-07 09:47:56 -08:00
Erin Song	4b403dc6f5	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/3285-delete-manager-email	2025-02-07 09:32:47 -08:00
zandercymatics	dd9b4ec6e0	Update admin.py	2025-02-07 08:32:29 -07:00
zandercymatics	7058f7c1c4	Merge branch 'main' into za/3463-fix-analytics-breadcrumb	2025-02-07 08:22:08 -07:00
zandercymatics	e7d40550c7	Remove url extension logic ... Not needed for this PR - we don't know yet quite what we want to do	2025-02-07 08:19:26 -07:00
asaki222	6857f33607	Merge pull request #3453 from cisagov/rh/2719-action-non-production-sandbox ... #2719 - delete and recreate database workflow	2025-02-07 09:56:35 -05:00
asaki222	f7cb7666ea	updating to main	2025-02-07 09:51:21 -05:00
dave-kennedy-ecs	546d978d32	Merge pull request #3454 from cisagov/dk/3448-stale-invitations ... #3448, #3449: Fixes for canceled and retrieved invitations	2025-02-06 17:31:19 -05:00
David Kennedy	fd5a78e75f	Merge branch 'main' into dk/3448-stale-invitations	2025-02-06 17:26:14 -05:00
zandercymatics	9e1628aa84	Add proper breadcrumb	2025-02-06 14:48:21 -07:00
Erin Song	bcf2f0946c	Fix linting	2025-02-06 13:07:30 -08:00
Rebecca Hsieh	95d912ecbc	Did it the endpoint method way which was sadly incorrect	2025-02-06 13:04:53 -08:00
Erin Song	04a08e19dd	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/3285-delete-manager-email	2025-02-06 12:00:11 -08:00
Erin Song	ba9deb7a93	Move admin tests to admin.py	2025-02-06 12:00:08 -08:00
asaki222	5247bc3c87	missed a comment space	2025-02-06 14:33:58 -05:00
Matt-Spence	5277e8470b	Merge pull request #3298 from cisagov/ms/3125-fix-sandbox-log-output ... #3125: Remove JSON formatting from Non-Error logs - [KO]	2025-02-06 14:31:34 -05:00
Matt-Spence	37d160bd1e	Merge branch 'main' into ms/3125-fix-sandbox-log-output	2025-02-06 14:05:58 -05:00
dave-kennedy-ecs	5aebbb4609	Merge pull request #3441 from cisagov/bob/2416-portfolio-admin-emails ... #2416: portfolio admin notification emails	2025-02-06 13:59:45 -05:00
David Kennedy	05aca45890	Merge branch 'main' into bob/2416-portfolio-admin-emails	2025-02-06 13:51:42 -05:00
asaki222	8c35346a58	increased timeout and fixed spacing	2025-02-06 13:51:19 -05:00
asaki222	640805833b	increased timeout	2025-02-06 13:50:09 -05:00
zandercymatics	38e6b06d3c	Merge pull request #3430 from cisagov/za/3145-use-transaction-atomic ... #3145: Change usage of transaction.atomic() to be inside try/catch instead of outside of it [litterbox]	2025-02-06 11:48:11 -07:00
zandercymatics	c80348b1c8	Update src/registrar/fixtures/fixtures_portfolios.py	2025-02-06 11:33:20 -07:00
David Kennedy	cf516778a3	Merge branch 'main' into bob/2416-portfolio-admin-emails	2025-02-06 13:26:23 -05:00
Matt-Spence	ae20ab27a3	Merge branch 'main' into ms/3125-fix-sandbox-log-output	2025-02-06 13:04:23 -05:00
asaki222	75ae3d3114	trying again	2025-02-06 12:46:27 -05:00
asaki222	a2151f4b03	updates	2025-02-06 12:43:13 -05:00
asaki222	1bba542a55	changes	2025-02-06 12:36:41 -05:00
zandercymatics	725a229278	Merge branch 'main' into za/3145-use-transaction-atomic	2025-02-06 09:09:45 -07:00
dave-kennedy-ecs	61b1174934	Merge pull request #3452 from cisagov/meoward/3429-suborg-permissions ... #3429: combined suborg and portfolio permissions [MIGRATION] [MEOWARD]	2025-02-06 04:35:00 -05:00
David Kennedy	4b750fbc7f	Merge branch 'main' into meoward/3429-suborg-permissions	2025-02-06 04:26:18 -05:00
Cameron Dixon	3dad0d4b4c	Merge pull request #3460 from cisagov/remove-story ... Remove the "story" issue template	2025-02-05 22:09:13 -05:00
zandercymatics	c8217d7f53	remove unused imports	2025-02-05 15:39:54 -07:00
David Kennedy	63e82c9a3c	Merge branch 'main' into meoward/3429-suborg-permissions	2025-02-05 16:47:50 -05:00
David Kennedy	120650895a	normalized more portfolio permission names	2025-02-05 16:42:56 -05:00
Matt-Spence	4b6528166f	Merge branch 'main' into ms/3125-fix-sandbox-log-output	2025-02-05 15:07:21 -05:00
Cameron Dixon	2bdd1cf71e	Delete story.yml	2025-02-05 14:34:34 -05:00