489 commits

Author	SHA1	Message	Date
CocoByte	cf8b693626	resolve conflict	2024-07-17 13:38:10 -06:00
zandercymatics	f0f8bbf26a	add decorator	2024-07-16 12:44:04 -06:00
zandercymatics	35c8a57aa3	Merge branch 'main' into za/1901-allow-analysts-to-customize-action-needed-emails	2024-07-16 08:12:18 -06:00
zandercymatics	4aa816cfdf	Update test_admin.py	2024-07-15 12:14:07 -06:00
zandercymatics	c2d8c0eadb	fix test	2024-07-15 11:42:05 -06:00
zandercymatics	b68fe55584	Further refinement ... need to fix unit test	2024-07-15 11:30:38 -06:00
zandercymatics	f6e82c7a98	tests	2024-07-12 12:53:26 -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	37780c01a5	fixing tests	2024-07-11 14:33:32 -06:00
CocoByte	075dc97a9f	fixing tests	2024-07-11 14:32:22 -06:00
CocoByte	e50c1c41da	fixing unit tests to reflect new read-only fields	2024-07-11 14:19:15 -06:00
CocoByte	1c05dbfbb6	fixing unit tests to reflect new read-only fields	2024-07-11 14:08:22 -06:00
David Kennedy	d981c410e8	linter	2024-07-09 17:30:45 -04:00
David Kennedy	f0dfe96e97	fixed tests	2024-07-09 17:24:35 -04: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	c2ba10f191	Linting!	2024-07-09 14:06:47 -06:00
zandercymatics	9a44f6b65a	Remove unused variable names	2024-07-09 14:03:52 -06:00
zandercymatics	92f269c69e	Fix tests and lint	2024-07-09 13:59:30 -06:00
zandercymatics	f18b10d669	Add logic for if just the email is changed	2024-07-08 08:47:44 -06:00
zandercymatics	204b907a54	lint	2024-07-08 08:30:47 -06:00
zandercymatics	0641e9ad72	linting	2024-07-08 08:26:32 -06:00
zandercymatics	b93a9b07b7	Merge branch 'main' into za/1901-allow-analysts-to-customize-action-needed-emails	2024-07-03 09:11:56 -06:00
zandercymatics	fd8607c82f	Merge branch 'main' into hotgov/2380-rearrange-status-fields	2024-07-03 08:08:38 -06:00
David Kennedy	be43bbc8b7	merge main	2024-07-02 17:13:09 -04:00
David Kennedy	1dc3bf883e	updated for linter	2024-07-02 17:10:52 -04:00
CuriousX	a8f73342e9	Merge pull request #2373 from cisagov/nl/2218-emails-readonly-for-analysts ... Issue #2218 - Make email field read-only for Users for analysts	2024-07-02 15:00:18 -06:00
David Kennedy	45c7f1aaa6	removed user from contact model and all associated logic	2024-07-02 16:59:18 -04:00
CocoByte	18c512deab	camel case	2024-07-02 14:32:38 -06:00
David Kennedy	5f5e487eb0	merge main	2024-07-02 15:27:40 -04:00
David Kennedy	6361369953	removed user-contact connection	2024-07-02 15:10:49 -04:00
zandercymatics	34f6b03078	Update test_admin.py	2024-07-02 11:29:57 -06:00
zandercymatics	083ed6fb25	Merge branch 'main' into za/1901-allow-analysts-to-customize-action-needed-emails	2024-07-02 11:29:08 -06:00
zandercymatics	5815d6733c	hash	2024-07-02 11:28:58 -06:00
CocoByte	508c3d3988	Updated "Personal Info" to "User Profile" again	2024-07-02 09:06:28 -06:00
zandercymatics	882f66d497	Merge branch 'main' into gd/2365-add-suborg-to-domain-info	2024-07-02 08:35:21 -06:00
Rebecca Hsieh	816922d411	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/2258-update-ao-to-so	2024-07-01 09:53:33 -07:00
CuriousX	f04f5ee789	Update src/registrar/tests/test_admin.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-06-30 21:55:38 -06:00
dave-kennedy-ecs	694cfa543b	Merge pull request #2364 from cisagov/bob/2274-renewal ... Issue #2274: removed data calculation from renew_domain DJA function	2024-06-29 07:10:26 -04:00
Rebecca Hsieh	dcc29dbcc7	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/2258-update-ao-to-so	2024-06-28 09:51:34 -07:00
zandercymatics	da01b23761	Merge branch 'main' into hotgov/2380-rearrange-status-fields	2024-06-28 08:42:20 -06:00
zandercymatics	e668dc23c9	Merge pull request #2375 from cisagov/meoward/2278-move-rejection-reason ... (on getgov-meoward) Ticket #2278: Change the rejection reason field error message	2024-06-27 14:27:59 -06:00
zandercymatics	77acdc18e0	Merge branch 'main' into gd/2365-add-suborg-to-domain-info	2024-06-27 14:23:22 -06:00
zandercymatics	3775b33dcc	linting and remove leftover	2024-06-27 14:20:24 -06:00
zandercymatics	c18804de81	linting + test	2024-06-27 14:12:18 -06:00
Rebecca Hsieh	7d85dced0d	Update migration and conflict	2024-06-26 14:09:30 -07:00
zandercymatics	a8c4edd15f	Update src/registrar/tests/test_admin.py	2024-06-26 14:21:33 -06:00
zandercymatics	4919e68606	fix unit test	2024-06-26 11:34:11 -06:00
zandercymatics	77bd49c661	Fix unit test	2024-06-26 08:16:15 -06:00
CocoByte	ac6bac04f2	linted	2024-06-25 14:51:12 -06:00