8119 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matt-Spence	00e784e1ae	Merge pull request #2705 from cisagov/ms/2561-alter-log-format ... Issue #2561: format logs as json (on getgov-ms)	2024-09-12 13:02:03 -05:00
matthewswspence	529178cd84	linter error fixes	2024-09-12 12:55:12 -05:00
Rachid Mrad	58a32df8dc	Merge pull request #2735 from cisagov/rb/2687-copy-request-summary ... Issue #2687: Account for different superuser and analyst markup for copy request summary	2024-09-12 12:24:35 -04:00
zandercymatics	91b69a34c7	Merge pull request #2670 from cisagov/ag/2616-populate-suborg-and-portfolio-script ... Ticket #2616: populate suborg and portfolio script	2024-09-12 09:25:23 -06:00
matthewswspence	519ca82ee3	Remove type checking that was causing linter issues	2024-09-12 10:21:30 -05:00
zandercymatics	066e7965e4	Update docs/operations/data_migration.md	2024-09-12 09:04:55 -06:00
zandercymatics	d787fcb39d	Doc update	2024-09-12 08:50:21 -06:00
zandercymatics	87d35ebd7e	Update create_federal_portfolio.py	2024-09-12 08:47:37 -06:00
zandercymatics	060dbfc66c	More detailed logging on senior official	2024-09-12 08:39:01 -06:00
zandercymatics	3ececbbe27	Merge branch 'main' into ag/2616-populate-suborg-and-portfolio-script	2024-09-12 08:23:38 -06:00
zandercymatics	f2c4897419	doc update	2024-09-12 08:23:10 -06:00
asaki222	ba4713b7a8	Merge pull request #2710 from cisagov/ad/1405-fix-for-adding-a-duplicate-email-to-provide-warning-message ... Ad/1405 fix for adding a duplicate email to provide warning message	2024-09-11 14:51:50 -04:00
asaki222	6e80bc8c00	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into ad/1405-fix-for-adding-a-duplicate-email-to-provide-warning-message	2024-09-11 14:35:00 -04:00
asaki222	2069ab0d22	reverted the artifact change	2024-09-11 14:34:55 -04:00
matthewswspence	d33f9ae8e2	linter errors	2024-09-11 13:34:19 -05:00
matthewswspence	180a0240e5	conditionally set log format	2024-09-11 13:09:48 -05:00
zandercymatics	cf0671ef20	Merge branch 'main' into ag/2616-populate-suborg-and-portfolio-script	2024-09-11 10:44:20 -06:00
matthewswspence	635d8480f1	remove unused import	2024-09-11 10:50:10 -05:00
matthewswspence	0488b45273	remove test log	2024-09-11 10:49:27 -05:00
matthewswspence	ed4eeb469f	linter fixes	2024-09-11 10:42:26 -05:00
zandercymatics	8d890e3f25	Merge pull request #2744 from cisagov/za/fix-katherine-fixture-user-email ... Bugfix: Katherines email is listed incorrectly in fixtures	2024-09-11 09:35:44 -06:00
matthewswspence	eb3cb1e3d8	Don't use json locally, plus review changes	2024-09-11 10:34:32 -05:00
asaki222	a28b8a3af6	Merge pull request #2743 from cisagov/fix-for-django-security-check ... updated actions/upload-artifact to version4 due to failing checks for prs	2024-09-11 11:25:45 -04:00
zandercymatics	97c7826455	Update src/registrar/management/commands/create_federal_portfolio.py	2024-09-11 09:13:00 -06:00
zandercymatics	27f2157765	Add more logging detail	2024-09-11 09:05:44 -06:00
zandercymatics	7eaba2c56b	Update fixtures_users.py	2024-09-11 08:45:54 -06:00
asaki222	e921334a26	updated actions/upload-artifact to version4 due to failing checks	2024-09-11 10:25:53 -04:00
asaki222	60dedcde4e	updated upload-artifact	2024-09-11 10:19:48 -04:00
asaki222	5651b57d1e	updated upload-artifact	2024-09-11 10:19:26 -04:00
asaki222	31b7daf564	added an is	2024-09-11 09:50:47 -04:00
asaki222	aa01036e0f	updated text	2024-09-11 09:49:19 -04:00
zandercymatics	fbabd2029c	Merge branch 'main' into ag/2616-populate-suborg-and-portfolio-script	2024-09-10 14:25:59 -06:00
dave-kennedy-ecs	67a81b53ea	Merge pull request #2718 from cisagov/backup/2717-domain-table-filter ... Issue #2717: Domain table filtering for portfolio user with VIEW_MANAGED_DOMAINS	2024-09-10 11:59:20 -04:00
Rachid Mrad	39c881d7a5	account for different superuser and analyst markup	2024-09-09 13:19:38 -04:00
Matt-Spence	3a7044d31e	Merge pull request #2733 from cisagov/ms/fix-typehint-linter-errors ... Hotfix: fix linter errors	2024-09-09 10:26:23 -05:00
matthewswspence	872f943220	unused import	2024-09-09 10:10:04 -05:00
matthewswspence	ffaf3b5a37	fix linter errors	2024-09-09 10:00:34 -05:00
zandercymatics	8573950236	Merge pull request #2707 from cisagov/dk/2667-waffle-flags-org ... Issue #2667: Add waffle flags for organization requests and organization features	2024-09-09 08:36:41 -06:00
zandercymatics	d1b4054f0f	Merge branch 'main' into dk/2667-waffle-flags-org	2024-09-09 08:23:08 -06:00
Matt-Spence	1cc2840ff7	Merge pull request #2656 from cisagov/ms/2560-update-first-ready-values ... Issue #2560 update first ready values	2024-09-06 15:30:16 -05:00
Rachid Mrad	59b647b1a7	Merge pull request #2649 from cisagov/bob/2579-analyst-merge-user-accounts ... Issue #2579 #2644: Analyst can merge user accounts - [BOB]	2024-09-06 15:44:42 -04:00
Rachid Mrad	db593fcb6e	merge cleanup	2024-09-06 13:57:28 -04:00
Rachid Mrad	73e3ced96a	merge main	2024-09-06 13:51:18 -04:00
zandercymatics	44e363da04	Update create_federal_portfolio.py	2024-09-06 10:14:06 -06:00
zandercymatics	23d471f11c	Add --both	2024-09-06 10:08:50 -06:00
zandercymatics	de76577384	Merge branch 'main' into ag/2616-populate-suborg-and-portfolio-script	2024-09-06 09:29:09 -06:00
Matthew Spence	a2291d75ed	doc fixes	2024-09-06 10:27:52 -05:00
David Kennedy	008b9d57a5	cleanup	2024-09-06 08:58:28 -04:00
David Kennedy	467536600e	limit domains_json view to domains based on user's portfolio permissions	2024-09-06 08:56:27 -04:00
CuriousX	ae143e78cd	Merge pull request #2706 from cisagov/nl/2696-suborg-sort-button-fix ... Issue #2696: Suborganization sort button fix	2024-09-05 21:40:27 -06:00