6900 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Rebecca Hsieh	e59f3db898	Fix grammar	2024-06-26 16:48:20 -07:00
Rebecca Hsieh	7d85dced0d	Update migration and conflict	2024-06-26 14:09:30 -07:00
Rebecca Hsieh	9412fd281e	Remove migration	2024-06-26 13:58:17 -07:00
zandercymatics	041ed77aa4	Merge pull request #2340 from cisagov/za/2332-display-action-needed-text ... Ticket #2332: Display action needed reason email in django admin	2024-06-26 14:37:49 -06:00
zandercymatics	a8c4edd15f	Update src/registrar/tests/test_admin.py	2024-06-26 14:21:33 -06:00
zandercymatics	87512a589e	Regen migrations	2024-06-26 08:11:04 -06:00
zandercymatics	be88ef1238	Merge branch 'main' into za/2332-display-action-needed-text	2024-06-26 08:10:36 -06:00
zandercymatics	5cb24a7c1d	Delete 0105_domainrequest_action_needed_reason_email.py	2024-06-26 08:10:26 -06:00
Rebecca Hsieh	acc2328b01	Fix unit test	2024-06-25 11:29:01 -07:00
Rebecca Hsieh	0ec2a0db9d	Merge remote-tracking branch 'origin' into rh/2258-update-ao-to-so	2024-06-25 11:07:40 -07:00
zandercymatics	9fcbb0f492	Fix typo	2024-06-25 11:53:04 -06:00
Rebecca H	0fecc199d0	Merge pull request #2362 from cisagov/rh/2358-submitter ... ISSUE #2358: Update submitter check with profile_flag logic	2024-06-25 10:50:56 -07:00
zandercymatics	3bff5d5deb	Merge pull request #2343 from cisagov/za/email-metadata-2 ... Ticket #2235: Email domain request metadata alongside domain metadata	2024-06-24 15:31:08 -06:00
Rebecca Hsieh	4e3b7a49bc	Spelling error fix	2024-06-24 14:25:21 -07:00
Rebecca Hsieh	b8bc2900cc	Add comment	2024-06-24 14:24:33 -07:00
Rebecca Hsieh	668611f13e	Update test	2024-06-24 14:09:56 -07:00
Rebecca Hsieh	1c015b7aa1	Update to have flag logic	2024-06-24 12:46:26 -07:00
dave-kennedy-ecs	05d4461a1f	Merge pull request #2338 from cisagov/dk/2320-profile-redirect ... Issue #2320: Redirect user to either home or domain request	2024-06-24 15:45:08 -04:00
David Kennedy	51e6a925da	formatted for code readability	2024-06-24 15:39:05 -04:00
David Kennedy	350557a7a6	merge main	2024-06-24 15:34:10 -04:00
zandercymatics	d5cd639b85	Lint	2024-06-24 13:21:42 -06:00
zandercymatics	5fe084cdab	Add err handling	2024-06-24 13:18:37 -06:00
zandercymatics	aa1958c143	Comment out password override for local testing	2024-06-24 13:11:08 -06:00
Rebecca Hsieh	d167948695	Renaming files and adding migration in	2024-06-24 12:04:19 -07: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
Rebecca Hsieh	f98d02f02a	Base run through of changes from authorizing to senior	2024-06-24 11:52:14 -07:00
dave-kennedy-ecs	2ec954ff1d	Merge pull request #2342 from cisagov/bob/2330-org-homepage ... Issue #2330: Organizations homepage	2024-06-24 14:39:55 -04:00
Erin Song	6736ba7ced	Merge pull request #2345 from cisagov/es/2299-domaingroup-suborg-models ... Org Model: Add DomainGroup and Suborganization models	2024-06-24 11:37:00 -07:00
zandercymatics	3769113da3	Fix bug	2024-06-24 11:44:36 -06:00
Erin	69b81ba6d6	Remove import/export resource for domain group and suborg admin classes	2024-06-24 10:28:28 -07:00
Erin	60bbf5f0fc	Reorder description comment for domain group	2024-06-21 16:44:09 -07:00
zandercymatics	b934b21ce7	Update test_admin.py	2024-06-21 14:01:43 -06:00
zandercymatics	065458a8b9	Fix test that shouldnt be broken	2024-06-21 13:52:01 -06:00
zandercymatics	a59e59870c	Regen migration	2024-06-21 13:37:21 -06:00
zandercymatics	38f6a1b87a	Merge branch 'main' into za/2332-display-action-needed-text	2024-06-21 13:35:26 -06:00
zandercymatics	9b86fa43c4	Further simplification	2024-06-21 13:35:16 -06:00
zandercymatics	c84966b059	Refactor	2024-06-21 13:19:31 -06:00
zandercymatics	abc9fb78bc	Remove endpoint for email content ... We don't really need this. We can just store the email content on the DOM. There is no real performance impact -- its not a lot of content in the grand scheme of things and we'd just be doing a lot of api calls anyway	2024-06-21 13:02:15 -06:00
zandercymatics	5ae8df2bdb	Further simplify js logic	2024-06-21 12:40:19 -06:00
Erin	f60b79e13b	Readd migrations	2024-06-21 11:15:55 -07:00
Erin	5712596d19	Remove blank and null options from Domain Group	2024-06-21 11:06:25 -07:00
Erin	53991c127c	Remove blank/null option and add max length to Suborg	2024-06-21 09:39:12 -07:00
zandercymatics	5acaac7c6c	Add some docs	2024-06-21 10:19:00 -06:00
Erin	c220a8a9ac	Correct usergroup migration dependency	2024-06-21 09:10:19 -07:00
zandercymatics	4ac9e9d4f3	Remove os	2024-06-21 10:06:31 -06:00
Erin	f0756683ad	Create new user groups migration for DomainGroup and Suborg	2024-06-21 09:06:11 -07:00
zandercymatics	521c9a3243	Simplify	2024-06-21 10:03:50 -06:00
zandercymatics	fd0dcc3440	Edge cases ... Found a bug regarding the default display of the show more/less icons for the audit log table	2024-06-21 09:14:12 -06:00
Rachid Mrad	227d378f8d	Merge pull request #2326 from cisagov/rjm/delete-request-bug ... Fix delete request bug to ensure event listeners are not duplicated	2024-06-20 19:02:07 -04:00
David Kennedy	baee980b47	cleaned up a comment	2024-06-20 17:48:00 -04:00