8033 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Kennedy	a3204c872d	Merge branch 'rjm/2351-org-requests-page' of https://github.com/cisagov/manage.get.gov into rjm/2351-org-requests-page	2024-09-06 17:33:54 -04:00
David Kennedy	604da37de3	merge	2024-09-06 17:31:57 -04:00
zandercymatics	9019792bc8	Fix existing tests	2024-09-06 15:31:26 -06:00
David Kennedy	9f557fc1e1	requests_json tests and some linting	2024-09-06 17:27:56 -04:00
Rachid Mrad	1af08a6b48	model and view unit tests	2024-09-06 16:44:35 -04:00
zandercymatics	7a67845b6d	bug fix	2024-09-06 12:11:49 -06:00
Rachid Mrad	1e9ae7befc	cleanup	2024-09-06 13:46:52 -04:00
Rachid Mrad	49e656082a	merge	2024-09-06 12:55:01 -04:00
Rachid Mrad	cbdf763637	CSS done	2024-09-06 12:54:36 -04:00
zandercymatics	bb7a521bf4	Merge branch 'main' into rjm/2351-org-requests-page	2024-09-06 10:17:20 -06:00
zandercymatics	ea7544059e	Comment out breadcrumb bar ... Not needed in this PR	2024-09-06 08:36:23 -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
David Kennedy	6a08c1e97a	migrations file	2024-09-05 19:41:22 -04:00
David Kennedy	b4827ff5a3	merged pulled updates	2024-09-05 19:25:50 -04:00
David Kennedy	faf57902f0	filter requests based on permissions, updated actions based on permissions	2024-09-05 19:22:31 -04:00
Rachid Mrad	b4dd786c02	pull	2024-09-05 15:36:38 -04:00
Rachid Mrad	9ea0f312fc	CSS tweaks	2024-09-05 15:36:08 -04:00
zandercymatics	3c3fd26b93	Finishing or canceling a request redirects to domain request view	2024-09-05 13:16:38 -06:00
Rachid Mrad	2939c89e0d	pull	2024-09-05 15:02:12 -04:00
Rachid Mrad	d802b9a614	Add created by column	2024-09-05 15:01:37 -04:00
zandercymatics	9bd67cfdbe	fix bug with registrar and basic redirect link stuff	2024-09-05 11:38:16 -06:00
Rachid Mrad	ec7202b47c	merge main:	2024-09-05 12:25:08 -04:00
Rachid Mrad	bc2ae126f1	pull	2024-09-05 12:23:50 -04:00
Rachid Mrad	8f8d9a8692	last row accordion placement	2024-09-05 12:23:09 -04: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
David Kennedy	ba20e740b8	refactored domain_requests_json	2024-09-05 11:51:54 -04:00
Rachid Mrad	be8a618791	wip	2024-09-05 00:13:18 -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	7d2c7a593e	cleanup	2024-08-30 10:58:38 -04:00