8058 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	99cfa0ee97	linting	2024-09-10 08:38:56 -06:00
zandercymatics	9e7fa80bd0	Update user.py	2024-09-09 13:07:01 -06:00
zandercymatics	c5c3043eaa	Update user.py	2024-09-09 13:05:37 -06:00
zandercymatics	3955d5648f	Update user.py	2024-09-09 13:05:13 -06:00
zandercymatics	765a706f4d	Merge branch 'main' into za/2671-show-portfolios-on-user-table	2024-09-09 13:03:44 -06:00
Matt-Spence	3a7044d31e	Merge pull request #2733 from cisagov/ms/fix-typehint-linter-errors ... Hotfix: fix linter errors	2024-09-09 10:26:23 -05:00
matthewswspence	872f943220	unused import	2024-09-09 10:10:04 -05:00
matthewswspence	ffaf3b5a37	fix linter errors	2024-09-09 10:00:34 -05:00
zandercymatics	8573950236	Merge pull request #2707 from cisagov/dk/2667-waffle-flags-org ... Issue #2667: Add waffle flags for organization requests and organization features	2024-09-09 08:36:41 -06:00
zandercymatics	d1b4054f0f	Merge branch 'main' into dk/2667-waffle-flags-org	2024-09-09 08:23:08 -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
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
David Kennedy	49110461ef	lint	2024-09-05 12:10:49 -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
zandercymatics	9d4ab22dc4	fix unit test	2024-09-05 08:53:37 -06:00
zandercymatics	47e8934cde	Merge branch 'main' into za/2671-show-portfolios-on-user-table	2024-09-05 08:29:44 -06:00
zandercymatics	e5f2b83f6a	Fix failing tests	2024-09-04 15:34:54 -06: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	d802b51dc4	unit tests and lint	2024-09-04 14:38:58 -04:00
zandercymatics	dbe438b6dc	Update context_processors.py	2024-09-04 11:52:02 -06:00
zandercymatics	39e6cb8933	Add members	2024-09-04 11:50:44 -06:00
Rachid Mrad	cba2b27d79	escape dynamic values	2024-09-04 13:44:45 -04:00
David Kennedy	dd1b923404	wip	2024-09-04 13:41:26 -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	c57405a918	Update test_admin.py	2024-09-03 15:25:06 -06:00
zandercymatics	1cb14f8d6a	Update user_change_form.html	2024-09-03 14:48:26 -06:00
zandercymatics	c70e098f54	Update user_change_form.html	2024-09-03 14:46:31 -06:00
zandercymatics	82cd91d923	add portfolios view	2024-09-03 14:46:12 -06: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