10167 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
dave-kennedy-ecs	dbc2816ce5	Merge pull request #3287 from cisagov/dk/3053-hide-other-suborgs ... #3053: hide 'other' for portfolios without suborganizations	2025-01-06 17:43:10 -05:00
David Kennedy	2de0225aaf	merge main	2025-01-06 11:07:30 -05:00
Matt-Spence	1e12459c10	Merge pull request #3232 from cisagov/ms/3159-content-update ... #3159: match content in dotgov domain step of domain request in org model - [MS]	2025-01-06 10:59:43 -05:00
Matt-Spence	5ddd0834a0	Merge branch 'main' into ms/3159-content-update	2025-01-06 10:44:00 -05:00
Matt-Spence	f1b7e0197e	Merge pull request #3231 from cisagov/ms/1768-status-change-notifications ... #1768: status change notifications - MS	2025-01-03 14:19:02 -05:00
Matt-Spence	279209ff0e	Merge branch 'main' into ms/1768-status-change-notifications	2025-01-03 14:07:27 -05:00
Erin Song	c146a61707	Merge pull request #3277 from cisagov/es/code-review-update ... Remove adding devs in PR review doc	2025-01-03 10:46:04 -08:00
David Kennedy	d2f1d1f5a8	merge main	2025-01-03 13:20:52 -05:00
Erin Song	00a5fb5785	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/code-review-update	2025-01-03 09:55:33 -08:00
zandercymatics	e7e3c72e62	Merge pull request #3250 from cisagov/za/3025-add-new-suborgs ... Ticket #3025: Add new suborganizations on domain request approval	2025-01-03 08:07:32 -07:00
zandercymatics	f3d74eedfa	Merge branch 'main' into za/3025-add-new-suborgs	2025-01-03 07:57:25 -07:00
CuriousX	7e6af2e8a4	Merge pull request #3284 from cisagov/nl/3074-responsive-layouts-widescreen ... (restored PR) #3074 - Change (margin/padding) responsive layouts - [NL]	2025-01-02 23:32:08 -07:00
CocoByte	bf253e1cd2	Fix alignment of alerts	2025-01-02 21:39:26 -07:00
CocoByte	b536efd162	Resolved merge conflicts	2025-01-02 20:51:12 -07:00
David Kennedy	560a07f673	lint	2025-01-02 20:38:11 -05:00
David Kennedy	dc9919d168	Merge branch 'main' into dk/3053-hide-other-suborgs	2025-01-02 20:35:14 -05:00
David Kennedy	ce94775879	minor changes to content	2025-01-02 20:34:34 -05:00
dave-kennedy-ecs	1745f6a2d2	Merge pull request #3252 from cisagov/bob/3019-portfolio-invitation-email ... #3019: Portfolio and domain invitation emails	2025-01-02 20:08:13 -05:00
David Kennedy	8b291714ba	removed some extraneous log statements	2025-01-02 20:02:34 -05:00
David Kennedy	84f6445405	merge of main	2025-01-02 19:54:51 -05:00
David Kennedy	c70a16dc6a	fixed tests	2025-01-02 19:48:45 -05:00
Rachid Mrad	d9c7b1cc9a	Merge pull request #3247 from cisagov/rb/3158-request-table-ui-fixes ... #3158: UI fixes on the domain requests table - [RB]	2025-01-02 19:36:02 -05:00
Rachid Mrad	81c39c9756	Merge branch 'main' into rb/3158-request-table-ui-fixes	2025-01-02 19:31:19 -05:00
Rachid Mrad	2bfdd48066	Merge pull request #3246 from cisagov/rjm/2853-member-domains-submit ... #2853: Member domains submit - [RJM]	2025-01-02 19:31:03 -05:00
CocoByte	ce5e6b7d7c	Refactored margin on portfolio_ pages so that only single-page layouts have left margin	2025-01-02 17:17:43 -07:00
David Kennedy	c5325a6c56	updated logic to account for domain portfolio assignment	2025-01-02 18:55:05 -05:00
CocoByte	23eb3ebe96	fixed grid gap	2025-01-02 15:31:18 -07:00
David Kennedy	0c07e931d3	more cleanup in admin	2025-01-02 16:59:52 -05:00
David Kennedy	b39c143b9d	simplified logic on check for existing permission in admin	2025-01-02 16:56:54 -05:00
CocoByte	693720e720	Merge remote-tracking branch 'origin/main' into nl/3074-responsive-layouts-widescreen	2025-01-02 14:34:14 -07:00
CocoByte	16f44584b5	UPDATE TO AC -- add left margin for all single-page views	2025-01-02 14:34:00 -07:00
Erin Song	8f0fa1fcd8	Update python dependencies	2025-01-02 12:37:44 -08:00
Erin Song	54e5b7f20c	Add whitespace to prompt security check workflow	2025-01-02 12:34:17 -08:00
zandercymatics	419179f69d	Remove junk	2025-01-02 12:05:03 -07:00
zandercymatics	3b7746a409	Update package-lock.json	2025-01-02 11:51:42 -07:00
zandercymatics	ef8d8f17bf	Add unit test for requesting entity page	2025-01-02 11:51:05 -07:00
Erin Song	3477915221	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/code-review-update	2025-01-02 10:17:26 -08:00
zandercymatics	964bb7980b	Merge branch 'main' into za/3025-add-new-suborgs	2025-01-02 10:57:22 -07:00
zandercymatics	610d00b7a0	Add unit tests	2025-01-02 10:55:06 -07:00
Rachid Mrad	8ab6c76c61	merge main	2025-01-02 12:53:52 -05:00
dave-kennedy-ecs	59169e4990	Merge pull request #3276 from cisagov/ag/3255-domain-reports-take-three ... #3255 - CSV Export fixes	2025-01-02 12:52:19 -05:00
David Kennedy	a987c5dbcf	Merge branch 'main' into ag/3255-domain-reports-take-three	2025-01-02 12:47:14 -05:00
Rachid Mrad	c675ca5884	make surew we only split the domaininfo on invited items	2025-01-02 12:22:07 -05:00
David Kennedy	0eeee88f1c	hide 'other' for portfolios without suborganizations	2025-01-02 11:40:17 -05:00
zandercymatics	b7b9f96f7a	Merge branch 'main' into za/3025-add-new-suborgs	2025-01-02 09:35:23 -07:00
zandercymatics	c59cb24f51	Cleanup	2025-01-02 09:34:38 -07:00
zandercymatics	6f6e2dbc8b	Add clear button	2025-01-02 09:27:42 -07:00
CocoByte	4faf3df646	delete duplicate (unused) file	2024-12-31 16:46:06 -07:00
CocoByte	284657cf74	cherry-pick old PR changes (before revert)	2024-12-31 16:43:41 -07:00
CocoByte	64db4b0843	merge revert	2024-12-31 16:42:59 -07:00