11096 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
matthewswspence	b4176e4f86	review changes	2025-02-06 13:19:00 -06:00
Matt-Spence	37d160bd1e	Merge branch 'main' into ms/3125-fix-sandbox-log-output	2025-02-06 14:05:58 -05:00
David Kennedy	7718d6882a	Merge branch 'main' into backup/3004-org-permission-emails	2025-02-06 14:03:19 -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
matthewswspence	4d62bc13fb	Merge branch 'ms/3316-automatically-add-portfolio-members' of https://github.com/cisagov/manage.get.gov into ms/3316-automatically-add-portfolio-members	2025-02-06 12:41:10 -06:00
zandercymatics	f60ed6c0ea	Create patternomaly.js	2025-02-06 11:40:55 -07:00
matthewswspence	8eb7235ff1	Review changes and linting	2025-02-06 12:40:41 -06:00
David Kennedy	6d0b9d1a9e	last test for messages in dja	2025-02-06 13:39:04 -05:00
zandercymatics	3322837f0d	revert node changes	2025-02-06 11:34:24 -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
David Kennedy	e3e001fe0d	add static messages to admin confirmation messages	2025-02-06 13:25:54 -05:00
zandercymatics	90784eb69e	Change pattern	2025-02-06 11:25:46 -07:00
Matt-Spence	702ed9a24e	Update src/registrar/management/commands/create_federal_portfolio.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2025-02-06 12:12:35 -06:00
Matt-Spence	ea24a95532	Update src/registrar/management/commands/create_federal_portfolio.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2025-02-06 12:11:52 -06:00
Rachid Mrad	e7b91e348b	layout tweak	2025-02-06 13:09:27 -05:00
Matt-Spence	ae20ab27a3	Merge branch 'main' into ms/3125-fix-sandbox-log-output	2025-02-06 13:04:23 -05:00
zandercymatics	039882b918	add patternomaly	2025-02-06 11:02:21 -07: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	f2d14ad715	Try adding patternomaly	2025-02-06 10:08:04 -07:00
zandercymatics	725a229278	Merge branch 'main' into za/3145-use-transaction-atomic	2025-02-06 09:09:45 -07:00
David Kennedy	041ca70a8b	portfolio removed email and associated tests	2025-02-06 08:04:32 -05: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
CocoByte	67ab988d1e	removed role column	2025-02-05 22:50:01 -07: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
David Kennedy	f5ef200216	updated tests	2025-02-05 18:27:16 -05:00
zandercymatics	c8217d7f53	remove unused imports	2025-02-05 15:39:54 -07:00
David Kennedy	cbc9cdbe34	additional tests for email_invitations	2025-02-05 17:13:02 -05: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
David Kennedy	350508f9c1	email notification to portfolio member on permissions update	2025-02-05 16:31:22 -05:00
Rachid Mrad	f1b76ceb03	cleanp	2025-02-05 16:12:02 -05:00
Rachid Mrad	dc3351e8c0	revise UI of search bars with labels, create component	2025-02-05 16:05:49 -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
asaki222	9e038d1f93	updated to main	2025-02-05 10:08:48 -05:00
David Kennedy	0e6bc6f07f	added helpers for role and permissions displays in templates	2025-02-05 06:29:10 -05:00
David Kennedy	c157011cfc	Merge branch 'bob/2416-portfolio-admin-emails' into backup/3004-org-permission-emails	2025-02-04 19:59:28 -05:00
David Kennedy	5f545daed8	lint	2025-02-04 19:42:23 -05:00