10101 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
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
CocoByte	705ed34ea4	merge resolution	2024-12-31 16:35:42 -07:00
CocoByte	6ffe8b709d	fixed domain request view	2024-12-31 16:18:59 -07:00
CuriousX	2518bd5232	Merge pull request #3283 from cisagov/revert-3220-nl/3074-responsive-layouts-widescreen ... Revert "#3074 - Change (margin/padding) responsive layouts - [AB]"	2024-12-31 16:16:46 -07:00
CuriousX	b4cfb746dc	Revert "#3074 - Change (margin/padding) responsive layouts - [AB]"	2024-12-31 15:12:18 -07:00
Rachid Mrad	4442848a1d	fix error string interpolation	2024-12-31 15:11:15 -05:00
Rachid Mrad	feadf4391a	Add role when adding domains to existing user	2024-12-31 14:51:17 -05:00
CuriousX	5dcb3ea07d	Merge pull request #3220 from cisagov/nl/3074-responsive-layouts-widescreen ... #3074 - Change (margin/padding) responsive layouts - [AB]	2024-12-31 12:25:38 -07:00
Rachid Mrad	0597eac175	simplify left and right to x padding	2024-12-31 13:46:36 -05:00
Rachid Mrad	540b355cac	remove widescreen context processor	2024-12-31 13:39:30 -05:00
Rachid Mrad	8d74dc2844	merge upstream	2024-12-31 13:16:49 -05:00
Rachid Mrad	6b13a8f93f	footer and header adjustemnts	2024-12-31 13:16:14 -05:00
CuriousX	cfc7618c59	Merge branch 'main' into nl/3074-responsive-layouts-widescreen	2024-12-31 11:02:44 -07:00
Rachid Mrad	cf9cd80def	solidify members invited json test with multiple domain invites	2024-12-31 12:21:48 -05:00
dave-kennedy-ecs	231aca0b11	Merge pull request #3263 from cisagov/dk/3165-sort-bundle ... #3165: Bundle - bug fixes for 4 tickets, related to table sorting	2024-12-31 12:18:02 -05:00
Rachid Mrad	e15c57f3b3	lint and tests	2024-12-31 12:01:35 -05:00
David Kennedy	d9bdc999e4	Merge branch 'main' into dk/3165-sort-bundle'	2024-12-31 11:57:11 -05:00
Rachid Mrad	e3ff4f063d	merge main	2024-12-31 11:51:45 -05:00
dave-kennedy-ecs	b30de071bc	Merge pull request #3269 from cisagov/ag/3149-domain-request-compliance-bundle ... #3149: Bundle - 2 tickets related to request form compliance	2024-12-31 10:30:50 -05:00
David Kennedy	5b049c9d89	Merge branch 'main' into ag/3149-domain-request-compliance-bundle	2024-12-31 10:25:23 -05:00
David Kennedy	3474b35b4f	adding comments, removing logs	2024-12-31 10:24:39 -05:00
David Kennedy	2007daadbb	performed some cleanup	2024-12-31 08:16:28 -05:00
David Kennedy	b86d8bcdc0	Merge branch 'main' into bob/3019-portfolio-invitation-email	2024-12-31 07:47:44 -05:00
David Kennedy	35ecffcbac	fixed mapping of election org types	2024-12-31 07:32:19 -05:00
Rachid Mrad	99a60c09e7	revise error msg and log errors	2024-12-30 21:38:35 -05:00
Rachid Mrad	1547a107ea	pre-concatenate	2024-12-30 20:57:13 -05:00
CuriousX	42180b6ecb	Merge branch 'main' into nl/3074-responsive-layouts-widescreen	2024-12-30 15:03:13 -07:00