10045 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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	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
Matt-Spence	bc142e4d7f	Merge pull request #3244 from cisagov/ms/3087-quick-fixes ... #3087/#3099: Quick Content Fixes - [MS]	2024-12-30 16:31:16 -05:00
Matt-Spence	9f3b7d3cac	Merge branch 'main' into ms/3087-quick-fixes	2024-12-30 16:27:14 -05:00
Rachid Mrad	26b24c846c	Fix subquery in member domains json invitation query to handle multiple invites per email	2024-12-30 16:27:00 -05:00
Rachid Mrad	d3cb401e47	merge pull	2024-12-30 15:08:13 -05:00
Rachid Mrad	9cd759dac8	merge main	2024-12-30 15:07:37 -05:00
Rachid Mrad	0e3a105334	Update src/registrar/assets/src/sass/_theme/_typography.scss ... Co-authored-by: Alysia Broddrick <109625347+abroddrick@users.noreply.github.com>	2024-12-30 11:52:38 -05:00
matthewswspence	d51c022ec6	minor additional fix	2024-12-30 10:38:53 -06:00
David Kennedy	242eaeef1f	Merge branch 'main' into dk/3165-sort-bundle	2024-12-30 11:00:04 -05:00
David Kennedy	0417478ad7	improved readability with linter	2024-12-30 09:22:22 -05:00
David Kennedy	c8c80cc636	changes to exports for city, state, org_type, and DomainRequestDataType report	2024-12-30 09:13:14 -05:00
CuriousX	b8218d3d47	Merge branch 'main' into nl/3074-responsive-layouts-widescreen	2024-12-26 17:47:45 -07:00
Rebecca H.	5909a7cb49	Merge pull request #3270 from cisagov/rh/3142-expiring-soon ... #3142: Domain Expiring Filter + CTA Banner - [RH]	2024-12-26 13:29:55 -08:00
Rebecca Hsieh	736f6ed9b8	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3142-expiring-soon	2024-12-26 13:18:06 -08:00
CuriousX	ef2e22905a	Merge branch 'main' into nl/3074-responsive-layouts-widescreen	2024-12-26 12:10:38 -07:00
CuriousX	ccd483328d	Merge pull request #3265 from cisagov/nl/3264-fix-domain-request-hyperlink ... [DRAFT - pending ticket review] #3264 - Fix domain request admin table hyperlink - [NL]	2024-12-26 12:10:24 -07:00
Rebecca Hsieh	9758e5183e	Add changes for expiring soon without all the rebase junk	2024-12-26 08:55:42 -08:00
David Kennedy	8e1999d3b8	merge 2908 and 2909 into bundle	2024-12-26 11:24:16 -05:00
David Kennedy	748adc147d	Merge branch 'dk/2908-modal-focus-trap' into dk/3149-domain-request-compliance-bundle	2024-12-26 11:22:32 -05:00
David Kennedy	f2c3ae7030	ignore	2024-12-26 11:17:12 -05:00
David Kennedy	6e602b95c8	form level error handling with focus	2024-12-26 10:53:22 -05:00
David Kennedy	962e760c11	fix for focustrap on dnssec modal	2024-12-26 07:32:28 -05:00
David Kennedy	4f57678156	fix for focustrap on dnssec modal	2024-12-26 07:11:19 -05:00
David Kennedy	05de74dc9e	fixed modal focustrap in ds data form modal	2024-12-26 06:52:42 -05:00
CocoByte	080890bf45	fixed hyperlink	2024-12-25 20:44:40 -07:00