9621 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	c20aaee9a4	Merge pull request #3177 from cisagov/za/2768-make-additional-details-not-required ... #3057: Make additional details not required on the org request page - [ZA]	2024-12-05 14:13:25 -07:00
zandercymatics	babb935058	Merge branch 'main' into za/3057-make-additional-details-not-required	2024-12-05 13:13:39 -07:00
Rachid Mrad	52c8afc6bd	Merge pull request #3163 from cisagov/hotfix-gitignore ... Hotfix: tweak gitignore to include a directory	2024-12-05 13:25:10 -05:00
Rachid Mrad	1fed07d955	Merge branch 'main' into hotfix-gitignore	2024-12-05 13:19:11 -05:00
Rachid Mrad	7a03ffc7c9	Merge pull request #3138 from cisagov/bob/3133-transfer-user-bug ... #3133: Transfer user duplicate portfolio permission bug - [BOB]	2024-12-05 13:17:33 -05:00
Rachid Mrad	4a33352416	trigger runners	2024-12-05 13:16:38 -05:00
Rachid Mrad	49d96488ee	Merge branch 'main' into hotfix-gitignore	2024-12-05 13:14:04 -05:00
Rachid Mrad	78f708a4c0	Merge branch 'main' into bob/3133-transfer-user-bug	2024-12-05 13:12:38 -05:00
Rachid Mrad	d3a7f4582e	Merge pull request #3184 from cisagov/rjm/3183-stray-js ... #3183: Remove stray JS from org contact template - [RJM]	2024-12-05 13:11:43 -05:00
Rachid Mrad	84a2bf5252	Merge branch 'main' into rjm/3183-stray-js	2024-12-05 13:03:35 -05:00
zandercymatics	6fb56fe082	Merge pull request #3134 from cisagov/ag/3110-create-all-federal-executive-portfolios ... #3117 Allow create portfolio script to run for executive, legislative, and judical portfolios - [AG]	2024-12-05 10:56:41 -07:00
zandercymatics	8bc4e51b7c	Merge branch 'main' into ag/3110-create-all-federal-executive-portfolios	2024-12-05 10:47:22 -07:00
zandercymatics	715cccb416	Merge pull request #3111 from cisagov/za/3103-prevent-errors-member-management ... #3103: Prevent errors in django admin Member Management - [MEOWARD]	2024-12-05 10:44:24 -07:00
zandercymatics	bf255c4f10	Merge branch 'main' into ag/3110-create-all-federal-executive-portfolios	2024-12-05 10:39:47 -07:00
zandercymatics	29071daac8	Merge branch 'main' into za/3103-prevent-errors-member-management	2024-12-05 10:36:43 -07:00
zandercymatics	50467f904d	PR suggestions	2024-12-05 10:36:33 -07:00
dave-kennedy-ecs	1282897660	Merge pull request #3168 from cisagov/dk/3166-node-permissions-fix ... #3166: Fix for node container permissions bug	2024-12-05 07:10:07 -05:00
David Kennedy	3f062a96e8	updated to execute properly in github actions	2024-12-05 07:01:36 -05:00
David Kennedy	85b4caf959	Merge branch 'main' into dk/3166-node-permissions-fix	2024-12-04 21:06:57 -05:00
David Kennedy	c3a3fd282a	removed gosu and sudo dependencies	2024-12-04 21:00:40 -05:00
David Kennedy	07b76fe002	testing permissions on node	2024-12-04 20:08:58 -05:00
CuriousX	ee4a584db0	Merge pull request #3080 from cisagov/nl/2854-org-member-invitation ... #2854 - Org Member Invitation - [NL]	2024-12-04 11:01:11 -07:00
zandercymatics	3cfea0619d	PR feedback	2024-12-04 08:47:17 -07:00
CuriousX	2c2f1ab830	Update src/registrar/views/portfolios.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-12-04 01:20:11 -07:00
CuriousX	52937710df	Update src/registrar/assets/src/js/getgov/portfolio-member-page.js ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-12-04 01:20:00 -07:00
Rachid Mrad	0986295ab3	cleanup urbanization JS	2024-12-03 16:36:38 -05:00
Rachid Mrad	f7bbed1f03	remove inline CSS	2024-12-03 16:25:49 -05:00
Rachid Mrad	3fc9cf31e9	Remove stray JS from org contact template	2024-12-03 16:21:04 -05:00
zandercymatics	d5a8af2287	Update domain_request.py	2024-12-03 10:38:00 -07:00
zandercymatics	ee0f5e8a0d	Cleanup	2024-12-03 10:31:06 -07:00
zandercymatics	d5357bc2ee	Code cleanup	2024-12-03 10:19:35 -07:00
zandercymatics	2f47e0176b	Merge branch 'main' into za/3057-make-additional-details-not-required	2024-12-03 08:32:45 -07:00
CocoByte	38a3d38d0f	remove stray char (keyboard error?)	2024-12-02 19:49:35 -07:00
CocoByte	e0223e17b9	Addressed feedback	2024-12-02 17:32:09 -07:00
CocoByte	a5499dcc6f	Merge remote-tracking branch 'origin/main' into nl/2854-org-member-invitation	2024-12-02 13:53:55 -07:00
zandercymatics	1056bc2fed	remove unused imports	2024-12-02 13:16:50 -07:00
David Kennedy	ad998246ca	updated comments	2024-12-02 13:37:35 -05:00
David Kennedy	9cbd6d0223	node container permissions fixes	2024-12-02 12:42:45 -05:00
zandercymatics	7dcec63570	Merge branch 'main' into ag/3110-create-all-federal-executive-portfolios	2024-12-02 09:26:31 -07:00
zandercymatics	907c0b00f2	Add unit test on multiple portfolio flag	2024-12-02 09:23:17 -07:00
zandercymatics	f1d19a1bbc	Merge branch 'main' into za/3103-prevent-errors-member-management	2024-12-02 09:20:19 -07:00
CuriousX	28b964cc47	Merge pull request #3128 from cisagov/nl/2928-error-message-bundle ... #2928 - Updated all error messages to have error icon - [AB]	2024-11-29 21:36:45 -07:00
CocoByte	62ec595ce4	cleanup	2024-11-29 14:38:07 -07:00
CocoByte	dcdc878f13	WIP on nl/2854-org-member-invitation ... reinstated js portion of add new member page	2024-11-29 14:34:27 -07:00
zandercymatics	84f85d944f	Do the thing	2024-11-29 14:14:23 -07:00
zandercymatics	30f65383f0	Merge branch 'main' into ag/3110-create-all-federal-executive-portfolios	2024-11-29 13:45:17 -07:00
CocoByte	495b8f36ad	Merging main (need to reinstate js)	2024-11-29 12:03:06 -07:00
CocoByte	ac125f22f2	scss cleanup	2024-11-29 11:53:07 -07:00
CocoByte	291bf74650	Merge remnant?	2024-11-29 11:53:01 -07:00
CocoByte	50c50fe747	resolved merge	2024-11-29 11:52:37 -07:00