8045 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
CocoByte	b78e76a098	linted	2024-09-08 16:17:48 -06:00
CocoByte	0d0ef31382	Merge remote-tracking branch 'origin/main' into nl/2669-max-width-adjustment-for-wide-screens	2024-09-08 15:47:38 -06:00
CocoByte	d0da6bf3e0	fixed bug where scss is getting overriden	2024-09-06 17:22:12 -06:00
Matt-Spence	1cc2840ff7	Merge pull request #2656 from cisagov/ms/2560-update-first-ready-values ... Issue #2560 update first ready values	2024-09-06 15:30:16 -05:00
Rachid Mrad	59b647b1a7	Merge pull request #2649 from cisagov/bob/2579-analyst-merge-user-accounts ... Issue #2579 #2644: Analyst can merge user accounts - [BOB]	2024-09-06 15:44:42 -04:00
Rachid Mrad	db593fcb6e	merge cleanup	2024-09-06 13:57:28 -04:00
Rachid Mrad	73e3ced96a	merge main	2024-09-06 13:51:18 -04:00
Matthew Spence	a2291d75ed	doc fixes	2024-09-06 10:27:52 -05:00
CocoByte	0b01d608b3	Merge remote-tracking branch 'origin/main' into nl/2669-max-width-adjustment-for-wide-screens	2024-09-05 22:32:36 -06:00
CocoByte	87bc704699	corrected location of file	2024-09-05 22:32:26 -06:00
CocoByte	7a2963d712	Added simple frontend test for widescreen mode	2024-09-05 22:18:43 -06:00
CocoByte	40d6423bb6	linted	2024-09-05 21:46:38 -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
CocoByte	15fc5bf0e9	merged	2024-09-05 21:30:56 -06:00
CocoByte	ecc1038c34	Added widescreen detection and scss adjustments for Domains and Domain Request page	2024-09-05 21:27:41 -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
Rachid Mrad	c4dc3802a8	cleanup	2024-08-30 11:56:24 -04:00
Rachid Mrad	e1e812c5c7	Fix portfolio transfer	2024-08-30 11:51:24 -04:00
Rachid Mrad	6a196665dd	merge main	2024-08-30 11:11:54 -04:00
Rachid Mrad	7d2c7a593e	cleanup	2024-08-30 10:58:38 -04: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