8030 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	44e363da04	Update create_federal_portfolio.py	2024-09-06 10:14:06 -06:00
zandercymatics	23d471f11c	Add --both	2024-09-06 10:08:50 -06:00
zandercymatics	de76577384	Merge branch 'main' into ag/2616-populate-suborg-and-portfolio-script	2024-09-06 09:29:09 -06:00
CuriousX	ae143e78cd	Merge pull request #2706 from cisagov/nl/2696-suborg-sort-button-fix ... Issue #2696: Suborganization sort button fix	2024-09-05 21:40:27 -06:00
CocoByte	f158b71b39	Resolved merge conflicts	2024-09-05 21:33:00 -06:00
Rachid Mrad	cebbd42ce6	Merge pull request #2655 from cisagov/hotgov/2544-design-review ... Issue #2544: Design review on view and manage domains, org feature - [HOTGOV]	2024-09-05 12:21:54 -04:00
Rachid Mrad	a6b9d79fad	cleanup comments	2024-09-05 12:07:57 -04:00
Rachid Mrad	33191ae919	Merge pull request #2622 from cisagov/rjm/2521-portfolio-members-admin ... Issue #2521: Django admin portfolio members section - [RJM]	2024-09-05 12:03:10 -04:00
CocoByte	ecc5e86320	(missed a file in last push)	2024-09-04 14:23:34 -06:00
CocoByte	684cf181c9	fixed sort button issue (thank you Rachid and Zander for the peer programming)	2024-09-04 13:52:30 -06:00
Rachid Mrad	cba2b27d79	escape dynamic values	2024-09-04 13:44:45 -04:00
Rachid Mrad	dea71ce366	merge main	2024-09-04 13:31:44 -04:00
Rebecca H.	cc7f588dad	Merge pull request #2690 from cisagov/rh/2660-portfolio-beautify ... ISSUE 2660: Add Sticky Bar to Portfolios + Remove CISA Region	2024-09-04 09:11:03 -07:00
Alysia Broddrick	2593c4101d	Merge pull request #2694 from cisagov/staging-action-needed-email-hotfix ... Hotfix JS for edit email button not found	2024-09-03 15:20:45 -07:00
zandercymatics	bf2079a344	Merge pull request #2703 from cisagov/za/fix-additional-allowed-emails-bug ... Fix bug with fixtures on `additional_allowed_emails` adding strings instead of AllowedEmail objects	2024-09-03 14:08:00 -06:00
zandercymatics	ff00d564de	Update allowed_email_description.html	2024-09-03 14:01:30 -06:00
zandercymatics	1792e3c0d8	fix bug	2024-09-03 13:39:48 -06:00
Rachid Mrad	79fbc5c540	cleanup	2024-08-30 17:46:05 -04:00
Rachid Mrad	e20bfa5567	lint	2024-08-30 17:44:09 -04:00
Rachid Mrad	ca1c9bbb04	fix model tests?	2024-08-30 17:35:57 -04:00
Rachid Mrad	ef2adaaf28	No additional members found	2024-08-30 17:25:56 -04:00
Rachid Mrad	2af57c8aa8	Revise for multiple portfolios	2024-08-30 17:21:04 -04:00
zandercymatics	54e6ce21db	Merge pull request #2659 from cisagov/za/2597-block-email-sending ... Ticket #2597: Add an email whitelist for non-production environments	2024-08-30 14:49:05 -06:00
Rachid Mrad	fc2f4f08cc	Merge main	2024-08-30 14:51:23 -04:00
Rebecca Hsieh	2eef22f895	Update function name	2024-08-30 11:18:45 -07:00
Rachid Mrad	29a6a53fbe	Remove redundant code	2024-08-30 12:32:09 -04:00
Rachid Mrad	e59cb9ae7d	Hotfix JS for edit email button not found	2024-08-30 12:05:56 -04:00
zandercymatics	8732af18d9	Update create_federal_portfolio.py	2024-08-30 09:55:29 -06:00
zandercymatics	02bc0cba1a	Add suborg info to domains and requests	2024-08-30 09:49:43 -06:00
zandercymatics	db16ba284b	Update create_federal_portfolio.py	2024-08-30 09:35:45 -06:00
zandercymatics	47b7ee45cc	lint	2024-08-30 09:31:55 -06:00
Rachid Mrad	7d2c7a593e	cleanup	2024-08-30 10:58:38 -04:00
zandercymatics	b3b415b563	Remove logic for location information	2024-08-30 08:40:04 -06:00
Rachid Mrad	f16ceccea7	cleanup	2024-08-30 10:33:52 -04:00
Rachid Mrad	973fa0c30a	tweak icon sizes	2024-08-30 10:33:24 -04:00
Rachid Mrad	aa29b71d51	merge main	2024-08-29 19:26:29 -04:00
Rachid Mrad	6cc89e7841	double td padding right on desktop, edit h1 margin on org domains	2024-08-29 19:23:16 -04:00
Rachid Mrad	8f609fef95	refactor icons in links and buttons	2024-08-29 19:16:53 -04:00
Rachid Mrad	87bde33ca2	cleanup	2024-08-29 18:31:39 -04:00
Rachid Mrad	c6d1c8a058	fix layout of sort icons	2024-08-29 18:23:41 -04:00
Rachid Mrad	9b422af635	fix layout of sort icons	2024-08-29 18:20:45 -04:00
Rachid Mrad	102b435d9e	fix spacing between export and search on domains table	2024-08-29 18:11:25 -04:00
Rachid Mrad	52fecffaf7	Change table row border color	2024-08-29 18:10:35 -04:00
Rachid Mrad	b9175f582b	Change section-outlined right padding from 16 to 32	2024-08-29 18:05:25 -04:00
Rachid Mrad	141037170d	change border color on org tables	2024-08-29 18:01:14 -04:00
zandercymatics	f2288673a0	Update create_federal_portfolio.py	2024-08-29 15:18:14 -06:00
Rebecca Hsieh	2e053936e7	Update SCSS naming and fix sticky row	2024-08-29 14:03:40 -07:00
Rebecca Hsieh	8d7e4bc436	Update to main	2024-08-29 13:33:56 -07:00
Rebecca Hsieh	72316d3129	Remove extraneous CSS	2024-08-29 13:32:49 -07:00
zandercymatics	b5a6bb69cf	Update fixtures_users.py	2024-08-29 14:29:03 -06:00