Commit graph

7254 commits

Author SHA1 Message Date
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
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
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
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
zandercymatics
9628c42dd6
reversion 2024-03-08 14:41:21 -07:00
zandercymatics
d189fffa84
Add create group 2024-03-08 14:36:46 -07:00
Alysia Broddrick
2a06ef3240
Merge remote-tracking branch 'origin' into rjm/1789-metrics-report 2024-03-08 13:22:46 -08:00
zandercymatics
454cac951a
Bug fix for PR 2024-03-08 13:41:40 -07:00
David Kennedy
29e3275a87
satisfied linter 2024-03-08 14:52:01 -05:00
Rebecca Hsieh
feafc74d05
Remove comment 2024-03-08 11:49:52 -08:00
David Kennedy
139e7f1183
remove .gov domain from domain form 2024-03-08 14:45:02 -05:00
Rebecca Hsieh
47147abf72
Update from created at to submission date 2024-03-08 10:55:40 -08:00
Alysia Broddrick
bd35244396
lint 2024-03-07 20:33:22 -08:00
Alysia Broddrick
d1bac52aa6
moved code line 2024-03-07 20:08:24 -08:00
Alysia Broddrick
33b47d27d1
handle none 2024-03-07 20:03:10 -08:00
David Kennedy
5f60134d1d
updated style on h2 2024-03-07 19:20:08 -05:00
CocoByte
a5ecb010b8
another go at camel-case correction 2024-03-07 15:31:14 -07:00
CocoByte
19fb8a0c04
remove css experiment & revert camel-case change 2024-03-07 15:24:00 -07:00
CocoByte
84c221bac6
camel-case correction for targeted models 2024-03-07 15:06:34 -07:00
zandercymatics
e900007c95
Update test_views_domain.py 2024-03-07 14:59:14 -07:00
CocoByte
a71c48a27d
fixed migrations 2024-03-07 14:52:58 -07:00