8355 commits

Author	SHA1	Message	Date
zandercymatics	d2149484c9	fix tests + cleanup	2024-12-13 11:31:22 -07:00
zandercymatics	d52a44a744	the perpetual struggle	2024-12-13 10:44:32 -07:00
zandercymatics	d48c140177	cleanup	2024-12-13 09:53:44 -07:00
zandercymatics	ba170c30e1	Merge branch 'main' into za/2756-edit-member-access	2024-12-13 09:34:10 -07:00
zandercymatics	2d0c4e7b1d	Update portfolios.py	2024-12-12 15:40:36 -07:00
zandercymatics	f6e95cc4f8	Add stub for email adding	2024-12-12 15:14:05 -07:00
David Kennedy	28ad3d7f10	Merge branch 'main' into rjm/2768-edit-member-domains	2024-12-12 15:31:54 -05:00
dave-kennedy-ecs	048b558de6	Update src/registrar/templates/includes/member_domains_edit_table.html ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-12-12 15:22:23 -05:00
dave-kennedy-ecs	c743648fe0	Update src/registrar/assets/src/js/getgov/table-edit-member-domains.js ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-12-12 15:21:28 -05:00
zandercymatics	d7ec32d898	Rework NewMemberView (will readd email logic)	2024-12-12 13:15:27 -07:00
zandercymatics	6662d82539	Consolidate js	2024-12-11 14:03:38 -07:00
zandercymatics	9fe87fbba1	wrap up js	2024-12-11 13:51:18 -07:00
zandercymatics	4f3663efa0	Fix js	2024-12-11 13:31:33 -07:00
zandercymatics	0ab963db1e	Consolidate	2024-12-11 13:21:22 -07:00
zandercymatics	2bc8d38002	add logic for invitation	2024-12-11 12:57:57 -07:00
CuriousX	b6ae8676c5	Merge branch 'main' into nl/3210-fix-converted-federal-agency-none-check	2024-12-11 11:08:52 -07:00
Rachid Mrad	9ad5202506	Merge branch 'main' into bob/2658-aria-describedby-with-sublabel-and-error	2024-12-11 12:22:09 -05:00
zandercymatics	ae770ab3c2	Finish logic for permission setting	2024-12-10 15:37:13 -07:00
CocoByte	2a48cf676e	Fix converted_federal_agency in domain information (matches Domain Request)	2024-12-10 15:10:41 -07:00
asaki222	f8dd683a5f	removed a todo to trigger linters/tests/checks	2024-12-10 16:24:16 -05:00
zandercymatics	bc3a96aa87	fine comb	2024-12-10 13:50:30 -07:00
David Kennedy	e6d3313cbe	removed temporary bug fix	2024-12-10 15:17:27 -05:00
David Kennedy	d281cfa0d6	fix to federal agency property	2024-12-10 14:55:14 -05:00
David Kennedy	cfe126256c	session engine and serializer changes	2024-12-10 13:53:43 -05:00
David Kennedy	a64948f81b	merge main	2024-12-10 12:13:19 -05:00
zandercymatics	372217f3ad	Update zap.conf	2024-12-10 09:08:25 -07:00
zandercymatics	406cd71b12	remove old todo	2024-12-10 09:02:48 -07:00
zandercymatics	34ae797625	Update admin.py	2024-12-10 09:01:19 -07:00
zandercymatics	51df878b15	Add to out of scope	2024-12-10 08:56:37 -07:00
zandercymatics	5d228768e6	add comment	2024-12-10 08:12:41 -07:00
Rachid Mrad	ec65484d4c	Set a correct aria-describedby when sublabel and error	2024-12-09 18:27:09 -05:00
zandercymatics	ed9d215577	Form structure	2024-12-09 15:03:39 -07:00
Rachid Mrad	010950ef0c	unit tests and linting	2024-12-09 16:26:12 -05:00
zandercymatics	9ee81503e8	fix ordering	2024-12-09 12:08:09 -07:00
Rachid Mrad	5d41316386	permissions tests	2024-12-09 13:45:35 -05:00
Rachid Mrad	6761359b2f	merge main	2024-12-09 13:20:15 -05:00
Rachid Mrad	9a55090fc3	clean up comments	2024-12-09 13:19:07 -05:00
Rachid Mrad	22585d2ab7	merge	2024-12-09 12:56:05 -05:00
Rachid Mrad	e4085932d7	fix margins and padding	2024-12-09 12:55:36 -05:00
zandercymatics	8dfb183ce0	Copy template	2024-12-09 10:38:46 -07:00
David Kennedy	4a253132da	fixed unrelated failing test	2024-12-09 12:32:43 -05:00
David Kennedy	7fc9815cee	added comments to javascript	2024-12-09 12:02:28 -05:00
lizpearl	7b0d7d3b4f	Merge branch 'main' into el/2372-change-rejection-title	2024-12-06 16:56:34 -06:00
zandercymatics	f32d8c7a31	fix linting issue	2024-12-06 15:29:47 -07:00
David Kennedy	20f0a492aa	accounting for annotations in figma	2024-12-06 16:36:22 -05:00
David Kennedy	01e6296ed4	pagination and file cleanup	2024-12-06 16:25:53 -05:00
Rachid Mrad	69be519451	cancel button and modal	2024-12-06 16:05:20 -05:00
zandercymatics	00aee2a4fe	Update domain.py	2024-12-06 13:09:03 -07:00
zandercymatics	fbfde73276	temp change to create igorville	2024-12-06 13:03:55 -07:00
zandercymatics	0bad59c942	Merge branch 'main' into za/3045-working-dns-prototype	2024-12-06 12:43:27 -07:00