1118 commits

Author	SHA1	Message	Date
zandercymatics	0641e9ad72	linting	2024-07-08 08:26:32 -06:00
CocoByte	269c8d641d	Merge remote-tracking branch 'origin/main' into nl/2300-Senior-Official-Table	2024-07-03 11:34:33 -06:00
zandercymatics	87c7a4dba2	Update admin.py	2024-07-03 09:19:33 -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
CocoByte	ae4e435e49	Merge remote-tracking branch 'origin/main' into nl/2300-Senior-Official-Table	2024-07-02 15:03:20 -06: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
zandercymatics	a8fa24411e	Email logic (needs cleanup)	2024-07-02 12:56:26 -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
CocoByte	508c3d3988	Updated "Personal Info" to "User Profile" again	2024-07-02 09:06:28 -06:00
CocoByte	838b6acc48	Merge remote-tracking branch 'origin/main' into nl/2300-Senior-Official-Table	2024-07-02 08:58:53 -06:00
zandercymatics	882f66d497	Merge branch 'main' into gd/2365-add-suborg-to-domain-info	2024-07-02 08:35:21 -06:00
CocoByte	05f7e69903	fixed edge case	2024-07-01 16:00:11 -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
zandercymatics	1dff1c01ca	expand if statement for linter	2024-07-01 09:59:25 -06:00
zandercymatics	b6a70e6d3c	custom content logic	2024-07-01 09:56:09 -06:00
CuriousX	6d6aa7c713	Update src/registrar/admin.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-06-30 21:55:31 -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
zandercymatics	1cbd9234be	basic logic	2024-06-28 15:24:22 -06:00
zandercymatics	3b002e41c1	Merge branch 'hotgov/2380-rearrange-status-fields' into za/1901-allow-analysts-to-customize-action-needed-emails	2024-06-28 14:56:00 -06:00
zandercymatics	7ddf1d87bc	changes	2024-06-28 14:55:40 -06:00
CocoByte	b92ea89884	Merge remote-tracking branch 'origin/main' into nl/2300-Senior-Official-Table	2024-06-28 12:33:37 -06:00
zandercymatics	ef3dd0e545	lint	2024-06-28 10:25:34 -06:00
zandercymatics	688e7fb375	Display logic	2024-06-28 09:50:04 -06:00
zandercymatics	a0bfaf968b	Bug fix	2024-06-28 09:21:51 -06:00
zandercymatics	8872b9884a	Lint	2024-06-27 14:31:25 -06:00
zandercymatics	686c5515bf	Update admin.py	2024-06-27 14:27:03 -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
zandercymatics	0e6692b5f8	cleanup	2024-06-27 13:06:53 -06:00
zandercymatics	27afda9673	Logic wrapup	2024-06-27 12:30:27 -06:00
zandercymatics	906622bd55	Add seperate show more buttons	2024-06-27 10:18:45 -06:00
David Kennedy	b92c3cb7b8	updated modal to include current expiration date	2024-06-26 17:32:47 -04:00
Rebecca Hsieh	7d85dced0d	Update migration and conflict	2024-06-26 14:09:30 -07:00
zandercymatics	3a46dc0090	Fix bad logic in domaininformationinline ... Why wasn't this set before??	2024-06-26 10:18:08 -06:00
zandercymatics	b3904a662a	Update admin.py	2024-06-26 10:12:10 -06:00
zandercymatics	4c3404b885	Fine tuning	2024-06-26 10:07:19 -06:00
zandercymatics	5d68031dce	Add fields	2024-06-26 09:37:47 -06:00
zandercymatics	be88ef1238	Merge branch 'main' into za/2332-display-action-needed-text	2024-06-26 08:10:36 -06:00
CocoByte	8f46f06dcc	Merge main -> nl	2024-06-25 14:42:39 -06:00
CocoByte	1d0efe9163	Added e-mail field.	2024-06-25 14:34:39 -06:00
CocoByte	635220f83e	linted & fixed unit tests	2024-06-25 14:18:36 -06:00
CocoByte	cc7f698ddf	Made contact e-mail read-only for analysts. Updated title of User admin page to "User Profile"	2024-06-25 11:26:04 -06:00
David Kennedy	d0d4fbdb5f	removed data calculation from renew_domain dja function	2024-06-24 17:39:12 -04:00
Rebecca Hsieh	6e1669ddf8	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/2258-update-ao-to-so	2024-06-24 11:52:38 -07:00