1118 commits

Author	SHA1	Message	Date
Rachid Mrad	661d2d7a22	make portfolio a combo box on user edit model	2024-07-23 12:07:53 -04:00
David Kennedy	f96d9bcf3c	a few changes post merge	2024-07-23 09:29:44 -04:00
Rachid Mrad	faddfcec50	merge main	2024-07-22 15:39:46 -04:00
CocoByte	612eea1a1e	Merge remote-tracking branch 'origin/main' into nl/2359-portfolio-inline-domaingroups-and-suborgs	2024-07-19 12:41:41 -06:00
Rachid Mrad	53573a860a	Clear warning messages on Contact save	2024-07-19 14:18:24 -04:00
CuriousX	76d9b8cb8c	Merge pull request #2457 from cisagov/nl/2439-user-phone-readonly ... (DRAFT - needs sandbox) #2439 - Make user phone number field read only for analysts	2024-07-19 12:13:18 -06:00
David Kennedy	e9ba08f20a	small refactor	2024-07-18 13:48:27 -04:00
Rachid Mrad	cb3b1fd7fa	lint	2024-07-17 21:12:16 -04:00
Rachid Mrad	72ee81a43c	handle DJA ui and handle permission test for UserDomainRole	2024-07-17 15:38:38 -04:00
CocoByte	cf8b693626	resolve conflict	2024-07-17 13:38:10 -06:00
CocoByte	adf1c74190	Removed stray code from other ticket	2024-07-17 13:34:50 -06:00
Rachid Mrad	777be646a4	working permissions	2024-07-17 13:57:04 -04:00
Rebecca H.	87b0b6c358	Merge pull request #2447 from cisagov/rh/2388-show-details ... ISSUE #2388: Fix show detail section	2024-07-17 08:56:36 -07:00
Rachid Mrad	ebb95a7d67	build our permissions a bit more	2024-07-16 13:12:13 -04:00
zandercymatics	35c8a57aa3	Merge branch 'main' into za/1901-allow-analysts-to-customize-action-needed-emails	2024-07-16 08:12:18 -06:00
Rachid Mrad	b1ae220602	basic infra	2024-07-15 18:40:24 -04:00
zandercymatics	ea1e8aa510	lint	2024-07-15 11:52:16 -06:00
zandercymatics	b68fe55584	Further refinement ... need to fix unit test	2024-07-15 11:30:38 -06:00
Rebecca Hsieh	7364db4e24	Add fix for Domain as well	2024-07-15 09:00:44 -07:00
zandercymatics	646e375708	Fix bugs	2024-07-15 09:49:46 -06:00
zandercymatics	58605f11e5	Readonly on send	2024-07-12 15:11:42 -06:00
zandercymatics	41835d275f	Further simplification	2024-07-12 12:44:14 -06:00
zandercymatics	6d63c9f868	Minor edits to not use kwargs and lint	2024-07-12 11:59:36 -06:00
zandercymatics	025a128bae	Refactor	2024-07-12 11:54:27 -06:00
Rebecca Hsieh	95f3155035	Fix linting	2024-07-11 16:02:44 -07:00
Rebecca Hsieh	7921d959ed	Rearrange	2024-07-11 16:01:21 -07:00
Rebecca Hsieh	66851f191a	Accidentally removed senioradmin smh	2024-07-11 16:00:13 -07:00
Rebecca Hsieh	f10581c46a	Add comments back in	2024-07-11 15:58:44 -07:00
Rebecca Hsieh	e916308395	Fix show details for analyst	2024-07-11 15:56:07 -07:00
CocoByte	8b84fc765c	made user phone number field read only for analysts	2024-07-11 16:30:41 -06:00
CocoByte	6b80da0189	linted	2024-07-11 16:26:11 -06:00
CocoByte	5e8e94622a	more file restoration	2024-07-11 16:12:32 -06:00
CocoByte	e94e7e4190	trying again to restore admin.py	2024-07-11 15:21:09 -06:00
CocoByte	4dd82b1890	Undid some tainted changes (got my branches confused and it looks like reverts didn't work as expected)	2024-07-11 15:17:41 -06:00
CocoByte	2c0df91aaf	Merge remote-tracking branch 'origin/main' into nl/2426-federal-agency-read-only-bug	2024-07-11 14:45:29 -06:00
CocoByte	9e57248a9e	linted	2024-07-11 14:43:19 -06:00
CocoByte	1c05dbfbb6	fixing unit tests to reflect new read-only fields	2024-07-11 14:08:22 -06:00
CocoByte	27555706a6	Revert "Added inline form to Portfolio to manage related domain groups and suborganizations" ... This reverts commit c370d6766e.	2024-07-10 16:14:57 -06:00
CocoByte	6a5db18481	Added inline form to Portfolio to manage related domain groups and suborganizations	2024-07-10 16:14:30 -06:00
CocoByte	c370d6766e	Added inline form to Portfolio to manage related domain groups and suborganizations	2024-07-10 16:11:54 -06:00
CocoByte	c0959776ab	Merge remote-tracking branch 'origin/main' into nl/2426-federal-agency-read-only-bug	2024-07-09 18:50:13 -06:00
Rebecca Hsieh	ee51776815	Fix show detail section	2024-07-09 14:00:08 -07:00
David Kennedy	d1a390cec9	Merge branch 'main' into meoward/2247-user-contact	2024-07-09 16:56:54 -04:00
David Kennedy	a7abfa9cdb	made email readonly and fixed some unit tests	2024-07-09 16:48:03 -04:00
zandercymatics	92f269c69e	Fix tests and lint	2024-07-09 13:59:30 -06:00
zandercymatics	c3dfc08b25	Fix 500 bug	2024-07-09 12:57:42 -06:00
CocoByte	6f61eb8020	Enable super-admins to edit federal_agency	2024-07-08 21:03:04 -06:00
zandercymatics	91b9cb4379	Cleanup	2024-07-08 14:29:36 -06:00
zandercymatics	425cfbcb4e	Logic refactor	2024-07-08 14:13:29 -06:00
zandercymatics	204b907a54	lint	2024-07-08 08:30:47 -06:00