8440 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	41023a7855	merge requests branch	2024-09-12 12:58:13 -04:00
Rachid Mrad	16fc4462de	unit tests for the extra column in the template	2024-09-12 12:52:16 -04: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	46730b07cc	Add logic to change placeholder text	2024-09-12 10:02:12 -06:00
zandercymatics	0073f3499f	Fix merge conflict	2024-09-12 09:54:39 -06:00
zandercymatics	d66ad28574	Merge branch 'rjm/2351-org-requests-page' into dk/2593-domain-request-search-bar	2024-09-12 09:47:44 -06: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
Rachid Mrad	71a69fa995	cleanup	2024-09-12 01:06:26 -04:00
Rachid Mrad	e16dd2ea93	Fix unit tests	2024-09-11 21:50:58 -04:00
Rachid Mrad	71e46c7925	fix Organization sidenav links	2024-09-11 20:17:25 -04:00
Rachid Mrad	4a5213aeb1	fix Organization page headers	2024-09-11 20:12:12 -04:00
Rachid Mrad	da0487b0f2	fix unit tests	2024-09-11 17:07:11 -04:00
Rachid Mrad	6c5f566155	org name compoenents title change, State / territory lbel change	2024-09-11 17:01:15 -04:00
asaki222	d386e69c9d	closed a tag	2024-09-11 16:49:30 -04:00
asaki222	91532adc30	updated to main	2024-09-11 16:36:58 -04:00
asaki222	e7936cef5f	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into meoward/2591-Remove-Profile-feature-flag	2024-09-11 16:36:30 -04:00
Rachid Mrad	7242594e04	Change fed agency label to org name	2024-09-11 15:40:00 -04: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
Rebecca Hsieh	171b47cc73	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/2162-delete-submitter-v2	2024-09-11 10:03:20 -07:00
zandercymatics	cf0671ef20	Merge branch 'main' into ag/2616-populate-suborg-and-portfolio-script	2024-09-11 10:44:20 -06:00
zandercymatics	953bb7d5b5	Merge branch 'main' into za/2671-show-portfolios-on-user-table	2024-09-11 10:26:40 -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
zandercymatics	d7b851ebf4	Merge branch 'rjm/2351-org-requests-page' of github.com:cisagov/manage.get.gov into rjm/2351-org-requests-page	2024-09-11 09:46:39 -06: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	096dce78c3	PR suggestions	2024-09-11 09:25:19 -06:00
zandercymatics	87cb111813	Update src/registrar/views/domain_requests_json.py ... Co-authored-by: CuriousX <nicolle.leclair@gmail.com>	2024-09-11 09:24:27 -06:00
zandercymatics	a0c73caa77	Update src/registrar/templates/includes/header_extended.html ... Co-authored-by: CuriousX <nicolle.leclair@gmail.com>	2024-09-11 09:24:06 -06:00
zandercymatics	97c7826455	Update src/registrar/management/commands/create_federal_portfolio.py	2024-09-11 09:13:00 -06:00
zandercymatics	663fc99df9	Update src/registrar/assets/js/get-gov.js ... Co-authored-by: CuriousX <nicolle.leclair@gmail.com>	2024-09-11 09:07:48 -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