1636 commits

Author	SHA1	Message	Date
Alysia Broddrick	6944b31ba0	added nameserver error class	2023-10-04 17:57:16 -07:00
CuriousX	c3b38fedad	Update src/registrar/management/commands/load_transition_domain.py ... Co-authored-by: Neil MartinsenBurrell <neil.martinsen-burrell@gsa.gov>	2023-10-04 14:35:53 -06:00
CuriousX	487d2586fd	Update src/registrar/management/commands/load_transition_domain.py ... Co-authored-by: Neil MartinsenBurrell <neil.martinsen-burrell@gsa.gov>	2023-10-04 14:28:25 -06:00
zandercymatics	1e61a60fc9	Merge branch 'main' into za/937-invitation-does-not-work	2023-10-04 13:43:55 -06:00
zandercymatics	fdaee606bb	Fixed Gabys email	2023-10-04 13:43:40 -06:00
zandercymatics	664d9507b2	Black reformatting	2023-10-04 13:42:28 -06:00
zandercymatics	237b120d1f	Revert changes	2023-10-04 13:36:17 -06:00
zandercymatics	5a28ec9bea	Merge branch 'main' into za/1120-update-domain-overview-verbiage	2023-10-04 13:34:54 -06:00
zandercymatics	cb20b80d0c	Update contact_error.py	2023-10-04 13:28:09 -06:00
Rebecca Hsieh	be78b87c4a	Remove extraneous prints	2023-10-04 09:32:19 -07:00
zandercymatics	41eab0d3a7	Fix verbiage	2023-10-04 10:31:59 -06:00
Rebecca Hsieh	d4c02da3d7	Add in merge	2023-10-04 09:28:22 -07:00
zandercymatics	e6948f462b	Correct a typo on the success message ... Per Gabys request	2023-10-04 10:27:09 -06:00
zandercymatics	6c7ca8bb97	Merge branch 'main' into za/850-epp-contact-get	2023-10-04 10:26:34 -06:00
Rebecca Hsieh	fbad2abd9d	Remove extraneous print statements and rename extendedValues to threeNS	2023-10-04 09:14:09 -07:00
Erin Song	8f1077acaa	Merge pull request #1112 from cisagov/es/989-update-user-management-table ... Rename admin role to manager	2023-10-04 09:06:25 -07:00
Rachid Mrad	cc0acdba94	test tweak to match type defined in admin.py	2023-10-04 11:56:45 -04:00
Alysia Broddrick	b5654500ab	Merge pull request #1114 from cisagov/dependabot/pip/src/urllib3-1.26.17 ... Bump urllib3 from 1.26.16 to 1.26.17 in /src	2023-10-03 18:44:08 -07:00
Alysia Broddrick	12467276b5	status line added to prevent failure	2023-10-03 17:09:55 -07:00
Rachid Mrad	a2a7382ee9	lint	2023-10-03 18:59:25 -04:00
Rachid Mrad	09303401ed	cleanup some code	2023-10-03 18:54:55 -04:00
Rachid Mrad	08514a75dc	add back Kristina and Erin after merging from main	2023-10-03 18:46:57 -04:00
Rachid Mrad	3ea1f5aa77	Merge remote-tracking branch 'origin/main' into rjm/1027-groups-permissions-logging	2023-10-03 18:46:22 -04:00
dave-kennedy-ecs	b932dd46d7	Merge pull request #1093 from cisagov/dk/902-epp-dnssec ... 902 - EPPLIB DNS SEC Get and Set DSData and KeyData	2023-10-03 17:29:38 -04:00
David Kennedy	a24fd3cdac	changes to test_domain_model to stop addtl pathcer from running concurrently	2023-10-03 17:24:10 -04:00
Alysia Broddrick	475f1ef11c	fix linting	2023-10-03 14:07:57 -07:00
David Kennedy	1b4dea6ae5	fixed nameservers path	2023-10-03 16:59:42 -04:00
Alysia Broddrick	e69128c74a	add kristina as analyst	2023-10-03 13:52:43 -07:00
zandercymatics	b2f8753a98	Update domain.py	2023-10-03 14:28:27 -06:00
Alysia Broddrick	fbe584d857	adding kristina as admin	2023-10-03 13:25:12 -07:00
zandercymatics	c447eb407f	Undo additional changes - revert to PR accepted	2023-10-03 14:25:10 -06:00
zandercymatics	540a604055	Add default text	2023-10-03 14:14:25 -06:00
zandercymatics	9546aedd59	Lint	2023-10-03 12:57:34 -06:00
zandercymatics	a2b52176db	Merge branch 'main' into za/850-epp-contact-get	2023-10-03 12:53:56 -06:00
zandercymatics	238a33b95e	Cleanup	2023-10-03 12:53:47 -06:00
zandercymatics	6891ea76f2	Get security email context	2023-10-03 12:44:17 -06:00
zandercymatics	67ec6810e0	Deleted igorville reference	2023-10-03 12:11:34 -06:00
Rebecca Hsieh	5fcae0cb80	Add logic for is not subdomain but has ip test	2023-10-03 10:45:03 -07:00
zandercymatics	0413dbcbb4	Store in a form instead	2023-10-03 10:40:58 -06:00
zandercymatics	d645c2fbaa	Don't display default sec email	2023-10-03 10:30:39 -06:00
zandercymatics	64f3adc443	Merge branch 'main' into za/850-epp-contact-get	2023-10-03 10:07:08 -06:00
zandercymatics	3ef9ccb1ee	Fix linter + test	2023-10-03 09:54:42 -06:00
zandercymatics	e456cec33b	Requested PR changes ... Removed skip on test_domain_security_email_form, fixed common.py, extended contact_error.py, fixed domain_detail not showing the right data, small cleanup of domain.py	2023-10-03 09:16:56 -06:00
CocoByte	688b5742c9	linted ... Signed-off-by: CocoByte <nicolle.leclair@gmail.com>	2023-10-03 00:13:42 -06:00
CocoByte	e9c3c30ccc	Merge Main to Branch ... Signed-off-by: CocoByte <nicolle.leclair@gmail.com>	2023-10-02 23:49:10 -06:00
CocoByte	1633feb57b	-s	2023-10-02 23:43:22 -06:00
Rebecca Hsieh	d532c389c0	Add tests for subdomain and ip logic	2023-10-02 22:07:26 -07:00
dependabot[bot]	2015434bdb	Bump urllib3 from 1.26.16 to 1.26.17 in /src ... Bumps [urllib3](https://github.com/urllib3/urllib3) from 1.26.16 to 1.26.17. - [Release notes](https://github.com/urllib3/urllib3/releases) - [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst) - [Commits](https://github.com/urllib3/urllib3/compare/1.26.16...1.26.17) --- updated-dependencies: - dependency-name: urllib3 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>	2023-10-03 03:40:46 +00:00
Erin	fc8da5c012	Add migration to alter user domain role name	2023-10-02 15:10:34 -07:00
Rebecca Hsieh	88cb4fc78a	Resolve merge conflict issues	2023-10-02 14:16:24 -07:00