11639 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	1fdc33cd6b	Merge branch 'main' into za/3635-add-member-wrong-error	2025-03-12 15:13:05 -06:00
Erin Song	1221b85e57	Merge pull request #3616 from cisagov/es/3397-domain-typos ... 3397: Domain page content changes [es]	2025-03-12 12:17:34 -07:00
Erin Song	64b8caedb5	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/3397-domain-typos	2025-03-12 12:12:35 -07:00
zandercymatics	585569a006	bug fix	2025-03-12 10:29:38 -06:00
Matt-Spence	9697132000	Merge pull request #3605 from cisagov/ms/3212-FEB-purpose-questions ... #3212: FEB Domain Request Questions - [MS]	2025-03-12 12:17:20 -04:00
matthewswspence	0dd3aa5433	minor import fix	2025-03-12 10:58:51 -05:00
matthewswspence	47c795cc9f	migration fix	2025-03-12 10:39:02 -05:00
matthewswspence	266e0b7f53	fix migrations	2025-03-12 10:32:03 -05:00
matthewswspence	9b69f29691	Merge branch 'ms/3212-FEB-purpose-questions' of github.com:cisagov/manage.get.gov into ms/3212-FEB-purpose-questions	2025-03-11 16:04:41 -05:00
matthewswspence	951fe66105	fix odd spacing problem	2025-03-11 16:04:14 -05:00
Matt-Spence	0e361e60c6	Merge branch 'main' into ms/3212-FEB-purpose-questions	2025-03-11 17:01:21 -04:00
matthewswspence	95cd22d549	linter and merge fixes	2025-03-11 15:34:25 -05:00
matthewswspence	14944a970b	Merge remote-tracking branch 'origin/main' into ms/3212-FEB-purpose-questions	2025-03-11 15:24:22 -05:00
matthewswspence	b41e706dcd	review changes	2025-03-11 15:16:36 -05:00
zandercymatics	bde4f1fec5	Merge pull request #3613 from cisagov/za/3548-portfolio-domain-request-permissions ... #3548: Fix portfolio permissions on resources - [ZA]	2025-03-11 11:19:53 -06:00
matthewswspence	ba631dd857	small review fix	2025-03-11 10:51:19 -05:00
matthewswspence	b09f68946f	review changes	2025-03-11 10:48:54 -05:00
zandercymatics	031b7e6676	Update decorators.py	2025-03-11 08:27:55 -06:00
zandercymatics	ad39339404	Merge branch 'main' into za/3548-portfolio-domain-request-permissions	2025-03-11 08:13:09 -06:00
Slim	813cb0e84a	Merge pull request #3610 from cisagov/rh/3608-org-form-state-required ... #3608: Making State to be required in Domain Request form - [RH]	2025-03-10 14:13:02 -07:00
Rebecca Hsieh	a4fab2d516	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3608-org-form-state-required	2025-03-10 14:03:59 -07:00
zandercymatics	7d9ddebcf9	fix dumb typo	2025-03-10 15:02:38 -06:00
zandercymatics	062476ef58	Merge branch 'main' into za/3548-portfolio-domain-request-permissions	2025-03-10 14:43:43 -06:00
zandercymatics	d354f45e61	PR suggestions	2025-03-10 14:42:44 -06:00
zandercymatics	028ed115dc	Update src/registrar/decorators.py	2025-03-10 13:34:24 -06:00
CuriousX	4b11be6291	Merge pull request #3577 from cisagov/nl/3181-labels-for-investigator-and-senior-official ... #3181 - dynamic labels for investigator and senior official [-Bob]	2025-03-10 10:20:51 -06:00
CuriousX	a1ca052982	Merge branch 'main' into nl/3181-labels-for-investigator-and-senior-official	2025-03-10 10:13:50 -06:00
CuriousX	5c2c2e1fe3	Merge pull request #3560 from cisagov/nl/2855-add-searchbar-visible-labels ... #2855 - Update search bar with visible label for org and non-org [-NL]	2025-03-10 10:13:21 -06:00
zandercymatics	a9e51ad80c	Update export.html	2025-03-10 08:35:43 -06:00
CocoByte	eb0f022942	restored senior_official to a select2 component	2025-03-07 13:32:21 -07:00
CocoByte	7a128077b9	Fix wrapping and search icon responsiveness for small screen sizes. Also fixed aria labels (merge error)	2025-03-07 13:24:46 -07:00
CuriousX	c4d9d675c3	Merge branch 'main' into nl/3181-labels-for-investigator-and-senior-official	2025-03-07 13:06:25 -07:00
CuriousX	37be43259d	Update src/registrar/templates/django/admin/includes/detail_table_fieldset.html ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2025-03-07 13:06:10 -07:00
CuriousX	eafafb3eb5	Update src/registrar/admin.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2025-03-07 13:05:52 -07:00
CuriousX	c33d0f3856	Merge branch 'main' into nl/2855-add-searchbar-visible-labels	2025-03-07 13:05:03 -07:00
zandercymatics	b879c92ef7	Update decorators.py	2025-03-07 11:55:36 -07:00
zandercymatics	f4db3b2592	Battle of the linter circa 2025	2025-03-07 11:31:45 -07:00
zandercymatics	cc08b18bdd	Fix remaining unit tests	2025-03-07 10:53:15 -07:00
zandercymatics	452b8f3588	Update test_views_portfolio.py	2025-03-07 10:02:46 -07:00
zandercymatics	22e2453bba	Fix some more ids in tests	2025-03-07 07:52:24 -07:00
Rachid Mrad	8df1a63ab4	Merge pull request #3569 from cisagov/ad/3256-new-changes-on-name-servers-page ... #3256: Nameservers page redesign [AD]	2025-03-06 22:20:51 -05:00
Rachid Mrad	9d0ef3ddff	Merge branch 'main' into ad/3256-new-changes-on-name-servers-page	2025-03-06 21:57:38 -05:00
Rachid Mrad	d7447cff96	usa-alert--do-not-reset	2025-03-06 21:04:48 -05:00
Rachid Mrad	57f7427141	move minh to the row	2025-03-06 21:00:45 -05:00
Rachid Mrad	9c154876d6	repeatable form minh on initial add form	2025-03-06 20:54:12 -05:00
Rachid Mrad	d6e665d378	minh for form rows	2025-03-06 20:47:05 -05:00
Rachid Mrad	9e5ab55218	Fix margin	2025-03-06 20:40:35 -05:00
CuriousX	6396d0c877	Merge branch 'main' into nl/3181-labels-for-investigator-and-senior-official	2025-03-06 16:12:37 -07:00
CuriousX	ebdd9041b8	Merge branch 'main' into nl/2855-add-searchbar-visible-labels	2025-03-06 16:12:18 -07:00
CocoByte	39eb317afb	fixed if/else statement	2025-03-06 16:02:11 -07:00