9788 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	b5464a9da8	lintomatic	2024-12-13 14:12:00 -07:00
zandercymatics	c551a60e3a	Add Unit tests	2024-12-13 12:29:08 -07:00
zandercymatics	24480ec434	Polish of paint	2024-12-13 11:54:52 -07:00
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
dave-kennedy-ecs	6f6beef6e4	Merge pull request #3198 from cisagov/rjm/2768-edit-member-domains ... #2768: Edit member domains - [RJM]	2024-12-12 15:49:21 -05: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
Cameron Dixon	ab59b7a127	Merge pull request #3218 from cisagov/update-issue ... Add story info to issue template	2024-12-11 16:25:07 -05:00
Cameron Dixon	c69cfd72f3	Update issue-default.yml	2024-12-11 16:17:46 -05: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	c0f0cf8cff	Merge pull request #3213 from cisagov/nl/3210-fix-converted-federal-agency-none-check ... #3210 - Fix converted_federal_agency in domain information	2024-12-11 11:14:49 -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	2df6603ca3	Merge pull request #3202 from cisagov/bob/2658-aria-describedby-with-sublabel-and-error ... #2658: Set a correct aria-describedby when sublabel and error	2024-12-11 13:08:38 -05:00
CuriousX	62d53ffa2e	Merge branch 'main' into nl/3210-fix-converted-federal-agency-none-check	2024-12-11 11:00:16 -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
lizpearl	5fc1f6a515	Merge pull request #3161 from cisagov/el/3157-document-updating-sandbox-credentials ... #3157: Add documentation for adding secrets to an existing sandbox [No sandbox needed]	2024-12-10 16:52:43 -06:00
lizpearl	d9d59bedaa	Merge branch 'main' into el/3157-document-updating-sandbox-credentials	2024-12-10 16:47:35 -06: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	a4c22f7ed4	Merge pull request #3188 from cisagov/nobox/update-the-readme-for-feature-flag-portfolio-permissions ... Nobox/update the readme for feature flag portfolio permissions	2024-12-10 16:31:42 -05:00
asaki222	f8dd683a5f	removed a todo to trigger linters/tests/checks	2024-12-10 16:24:16 -05:00
asaki222	3059b60196	updated to main	2024-12-10 16:17:34 -05:00
dave-kennedy-ecs	61e6edb545	Merge pull request #3207 from cisagov/dk/3124-session-bug-release-fix ... #3124 - session engine and serializer changes - fix to be merged	2024-12-10 15:52:56 -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
lizpearl	029bc16684	Merge branch 'main' into el/3157-document-updating-sandbox-credentials	2024-12-10 12:47:10 -06:00
David Kennedy	a64948f81b	merge main	2024-12-10 12:13:19 -05:00
asaki222	22e56fd063	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into nobox/update-the-readme-for-feature-flag-portfolio-permissions	2024-12-10 11:44:47 -05:00
zandercymatics	8001c405d4	Merge pull request #3205 from cisagov/za/fix-owasp-csp-fail ... BUGFIX: Fix OWASP failure	2024-12-10 09:16:34 -07: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	f1f7a06eb8	Merge pull request #3200 from cisagov/za/bugfix-failing-member-test ... BUGFIX: Add order_by on MemberExport to fix flaky test	2024-12-10 08:26:42 -07:00
zandercymatics	5d228768e6	add comment	2024-12-10 08:12:41 -07:00
zandercymatics	c7c83cfb56	Merge branch 'main' into za/bugfix-failing-member-test	2024-12-10 08:11:51 -07:00
Cameron Dixon	abf8a46bd1	Merge pull request #3196 from cisagov/subissue-template ... Create sub-issue issue template	2024-12-10 09:55:23 -05:00