5507 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alysia Broddrick	f9360bec20	Merge remote-tracking branch 'origin' into dk/1839-domain-request-form	2024-03-13 14:06:08 -07:00
CocoByte	81f5ec827c	Merge remote-tracking branch 'origin/main' into nl/1798-update-email-signature	2024-03-13 13:19:14 -06:00
zandercymatics	21f06360f1	Remove unused import	2024-03-13 13:11:17 -06:00
zandercymatics	8f1aea0954	All hail the eternal linter	2024-03-13 13:07:30 -06:00
zandercymatics	425c67fc27	Unit test	2024-03-13 13:03:03 -06:00
zandercymatics	d0b252b354	Update admin.py	2024-03-13 12:35:56 -06:00
zandercymatics	753e086701	Merge conflicts	2024-03-13 12:23:40 -06:00
zandercymatics	f6462d4ccc	Merge branch 'main' into za/1701-prevent-federal-agency-modifying-AO	2024-03-13 12:19:20 -06:00
zandercymatics	4be6979af5	Basics	2024-03-13 12:19:03 -06:00
Rebecca H	f34fbaf44c	Merge pull request #1886 from cisagov/rh/1837-submitted-at ... ISSUE #1837: Update from created_at to submission_date	2024-03-13 10:56:38 -07:00
zandercymatics	763a1c51fc	Merge conflict fixes	2024-03-13 11:53:30 -06:00
zandercymatics	5cfd6193fd	Update client.py	2024-03-13 11:28:21 -06:00
zandercymatics	70bfd4343e	Add test, more semaphore(s)	2024-03-13 11:25:46 -06:00
Rebecca Hsieh	6dacc18956	Update final to email	2024-03-13 08:55:54 -07:00
Rebecca Hsieh	f0b510f09d	Remove extraneous TODOs except for 1	2024-03-13 08:48:25 -07:00
zandercymatics	f2c0b25eff	Merge branch 'main' into za/1889-socket-in-use-error	2024-03-13 08:18:22 -06:00
Alysia Broddrick	bc2843bfe7	undo code comments	2024-03-12 16:24:10 -07:00
Alysia Broddrick	5f56c0c1a1	Merge branch 'main' into new-dev-sandbox-meoward	2024-03-12 16:23:53 -07:00
Alysia Broddrick	240c5c8e53	added bob and meoward	2024-03-12 16:21:17 -07:00
zandercymatics	7b773c16b7	Merge branch 'main' into za/1530-warning-messages-changing-statuses	2024-03-12 16:45:21 -06:00
zandercymatics	f31d6ee073	Update test_admin.py	2024-03-12 16:44:56 -06:00
zandercymatics	20d39bcb69	Merge branch 'main' into za/1530-warning-messages-changing-statuses	2024-03-12 16:44:45 -06:00
CocoByte	8321c706ce	migration fixes	2024-03-12 16:42:27 -06:00
CocoByte	703be7e76a	Merge remote-tracking branch 'origin/main' into nl/1798-update-email-signature	2024-03-12 16:37:00 -06:00
CocoByte	2d44669f08	reverts	2024-03-12 16:36:52 -06:00
zandercymatics	cefd2fe86a	Merge pull request #1824 from cisagov/za/1676-require-investigator-da ... Ticket #1676: Require investigator for approval	2024-03-12 16:13:57 -06:00
zandercymatics	26dabb3ab0	Update test_models.py	2024-03-12 16:10:19 -06:00
zandercymatics	7f5bfa07a6	Additional	2024-03-12 15:58:35 -06:00
zandercymatics	0f0ce6be53	Additional merge conflicts	2024-03-12 15:54:03 -06:00
zandercymatics	5661174a2d	Update admin.py	2024-03-12 15:48:46 -06:00
zandercymatics	a5a3c13653	Merge conflictts pt 1	2024-03-12 15:47:30 -06:00
zandercymatics	ca1a79a97f	Update fixtures_domain_requests.py	2024-03-12 15:35:39 -06:00
zandercymatics	2df8713b96	Merge branch 'main' into za/1676-require-investigator-da	2024-03-12 15:34:29 -06:00
CocoByte	ecb853edbb	merge main into 1798	2024-03-12 15:29:14 -06:00
zandercymatics	6992f1489b	Fix comment	2024-03-12 15:01:01 -06:00
zandercymatics	3b9f68ac4b	linting	2024-03-12 14:59:55 -06:00
CuriousX	39d9377963	Merge pull request #1897 from cisagov/nl/1064-Change-domain-application-to-domain-requests ... (Attempt 2) #1064: change domain application to domain requests	2024-03-12 14:43:18 -06:00
zandercymatics	ee60be8b10	Add semaphore + add error handling for .close	2024-03-12 14:21:08 -06:00
CocoByte	1e44b20690	Revert "Merge remote-tracking branch 'origin/main' into nl/1798-update-email-signature" ... This reverts commit ef5358e7e2, reversing changes made to 5746dbe0a1.	2024-03-12 12:37:49 -06:00
CocoByte	d4ddd6bb38	more fixes	2024-03-12 12:37:31 -06:00
CocoByte	5d41eae801	more fixes (works locally)	2024-03-12 00:24:04 -06:00
Katherine-Osos	058bbd7ab6	Merge pull request #1893 from cisagov/ko/processing-time ... Update language around processing time	2024-03-11 16:09:06 -05:00
CocoByte	d83bd361cb	Fix migrations (rename domainApplication model instead of delete/create)	2024-03-11 13:16:27 -06:00
Katherine-Osos	aea63d08ee	Update email language	2024-03-11 12:45:06 -05:00
Katherine-Osos	a4822a069e	Update language around processing time	2024-03-11 12:26:05 -05:00
CocoByte	ef5358e7e2	Merge remote-tracking branch 'origin/main' into nl/1798-update-email-signature	2024-03-11 11:06:22 -06:00
David Kennedy	b27318e975	merge migrations	2024-03-09 06:45:30 -05:00
David Kennedy	17286f8847	Merge branch 'main' into dk/1839-domain-request-form	2024-03-09 06:42:41 -05:00
David Kennedy	d75cbf50e3	merge changes	2024-03-09 06:41:10 -05:00
David Kennedy	274a3f7f08	Merge branch 'main' of https://github.com/cisagov/manage.get.gov	2024-03-09 06:28:34 -05:00