2544 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	7643a63d97	Update domain.py	2023-09-13 14:02:46 -06:00
zandercymatics	aad0aa676e	Funky merging	2023-09-13 13:57:10 -06:00
zandercymatics	5148ec4852	Merge branch 'main' into za/850-epp-contact-get	2023-09-13 13:46:06 -06:00
zandercymatics	1a7bf8a352	Merge branch 'main' into za/850-epp-contact-get	2023-09-13 13:44:34 -06:00
Alysia Broddrick	a7c5818b9d	Merge pull request #1005 from cisagov/ab/645-implement-test-cases-registry-integration ... Contact setting and rough epp management	2023-09-13 12:37:11 -07:00
rachidatecs	5cd75ee48b	Merge pull request #1019 from cisagov/rjm/1013-complex-tables-2 ... Issue 1013: Define col scopes	2023-09-13 15:34:36 -04:00
Rebecca Hsieh	8fd74fa6ac	Fix migrations	2023-09-13 10:47:25 -07:00
Alysia Broddrick	262e9b9478	removed comments	2023-09-13 10:19:34 -07:00
zandercymatics	e4a2c6d030	Fix sorting bug	2023-09-13 10:53:07 -06:00
Rachid Mrad	1326d04e6d	define col scopes	2023-09-13 12:29:00 -04:00
zandercymatics	7abc9bdf7d	Small changes	2023-09-13 09:41:31 -06:00
zandercymatics	80d37777c0	Merge branch 'main' into za/850-epp-contact-get	2023-09-13 09:12:26 -06:00
dave-kennedy-ecs	4daec217d7	Merge pull request #1012 from cisagov/dk/853-domain-app-admin-states ... Dk/853 domain app admin states	2023-09-13 10:34:07 -04:00
David Kennedy	af5ca2afdf	updated code for readability; handled ineligible status; tested for restricted user	2023-09-13 08:22:10 -04:00
Alysia Broddrick	29b8c72911	fixed tests and linter	2023-09-12 21:48:27 -07:00
Rebecca Hsieh	8a8fbdab64	Need to fix variables	2023-09-12 18:39:55 -07:00
Rebecca Hsieh	952fe96c00	Fix subject and text of domain invitation	2023-09-12 18:17:53 -07:00
Alysia Broddrick	4292c38b47	fixed linting and merge bug	2023-09-12 18:06:06 -07:00
Alysia Broddrick	e4c7155aca	fixed typo in on hold status	2023-09-12 17:47:56 -07:00
Rebecca Hsieh	9dc4568908	Fix migration	2023-09-12 17:15:54 -07:00
Rebecca Hsieh	02220feb7a	Merge branch 'main' of https://github.com/cisagov/getgov into rh/446-remove-type-of-work-q	2023-09-12 17:11:38 -07:00
Rebecca Hsieh	7c1520a0c2	Fix reformatting issues	2023-09-12 17:10:32 -07:00
Rebecca Hsieh	2f6799c62b	Remove comment and update error message wording	2023-09-12 16:58:24 -07:00
zandercymatics	3a2610ae27	Merge branch 'main' into ab/645-implement-test-cases-registry-integration	2023-09-12 15:51:53 -06:00
zandercymatics	971a6fd986	Fixing merge conflicts	2023-09-12 15:46:17 -06:00
zandercymatics	4f45a90d15	Merge branch 'main' into ab/645-implement-test-cases-registry-integration	2023-09-12 15:45:28 -06:00
rachidatecs	c6670bd9f6	Merge pull request #1003 from cisagov/rjm/937-admin-ux-review ... 1000 admin ux audit implementation of quick fixes	2023-09-12 17:28:59 -04:00
Rachid Mrad	7bf5814fa1	Merge remote-tracking branch 'origin/main' into rjm/937-admin-ux-review	2023-09-12 17:23:58 -04:00
rachidatecs	e91eff7812	Merge pull request #1014 from cisagov/rjm/1013-table-accessibility ... Issue 1013: Complex table headers and accessibility	2023-09-12 17:21:39 -04:00
David Kennedy	31d04c0269	added test for case where no status	2023-09-12 14:47:22 -04:00
Alysia Broddrick	f2264abe25	minor bug fixes	2023-09-12 11:12:00 -07:00
David Kennedy	74fa04fd6c	merge updates from main	2023-09-12 12:46:43 -04:00
dave-kennedy-ecs	5e0800862e	Merge pull request #991 from cisagov/dk/803-domain-client-hold ... Dk/803 domain client hold	2023-09-12 12:22:34 -04:00
David Kennedy	4b86a056db	some updates to test code	2023-09-12 12:16:58 -04:00
David Kennedy	a398a5c927	refactored response_change to use a dictionary of action functions	2023-09-12 11:04:26 -04:00
David Kennedy	889289f54e	make migrations, fix conflict from merge	2023-09-12 10:16:22 -04:00
David Kennedy	6a2f1b0bc8	Merge branch 'main' into dk/803-domain-client-hold	2023-09-12 10:09:28 -04:00
Alysia Broddrick	46bf21b8d9	removed unused variable	2023-09-12 05:55:50 -07:00
CuriousX	e148b5056e	Merge pull request #1004 from cisagov/nl/921-transition-domain-model ... Issue: 921 - added Transition Domain model	2023-09-11 23:35:25 -06:00
CuriousX	792640cac3	MERGE main into branch	2023-09-11 23:27:15 -06:00
Alysia Broddrick	235af93742	removed debug check on loading fixtures	2023-09-11 18:15:00 -07:00
Alysia Broddrick	e314c285d8	fixed some of the tests	2023-09-11 18:13:56 -07:00
Alysia Broddrick	c1c7ff9698	reverted uneeded changes	2023-09-11 17:47:05 -07:00
Alysia Broddrick	bc0b07d8bf	fixed linting issues	2023-09-11 17:46:11 -07:00
Rachid Mrad	16f69deda9	lighten hover color	2023-09-11 17:56:15 -04:00
Rachid Mrad	2dd6bc6f05	fix unsortable custom columns, fix font-size discrepancy on fixed buttons, lint	2023-09-11 17:50:49 -04:00
Rachid Mrad	70fd8907bb	remove captions and make complex tables with multiple headers	2023-09-11 17:09:20 -04:00
David Kennedy	1520e80adc	reformatted code to satisfy linter	2023-09-11 16:10:59 -04:00
Rachid Mrad	2df68d4b52	typecast obj and add a comment to the contact custom list_display for ContactAdmin	2023-09-11 16:06:36 -04:00
David Kennedy	3752148630	added test for DomainApplicationAdminForm	2023-09-11 15:46:03 -04:00