1952 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	c8c624e985	Fix gaby email	2023-10-11 09:04:46 -06:00
zandercymatics	24bbbebb10	Merge branch 'main' into za/937-invitation-does-not-work	2023-10-11 09:04:15 -06:00
zandercymatics	f1751b1ee7	Merge pull request #1129 from cisagov/za/1096-update-domain-button-text ... Ticket #1096: Small content changes for Domain buttons	2023-10-10 13:17:57 -06:00
zandercymatics	3c33b079f1	Removed comment	2023-10-10 13:11:51 -06:00
Erin Song	cc42c23064	Merge pull request #1135 from cisagov/es/989-update-user-management-table ... Ticket #983: Update page titles on user management portal	2023-10-10 12:05:47 -07:00
rachidatecs	1f97806255	Merge pull request #1095 from cisagov/rjm/1027-groups-permissions-logging ... Issue 1027: Refactor users, groups and permissions, logging on groups and permissions	2023-10-06 17:16:40 -04:00
Rachid Mrad	39757de89b	refactor and clean up migrations after merging from main	2023-10-06 17:00:10 -04:00
Rachid Mrad	8adce2f2ea	getOr	2023-10-06 16:48:18 -04:00
Rachid Mrad	59a82e5142	clean up migrations	2023-10-06 15:44:25 -04:00
Rachid Mrad	dc3ec3eb9a	lint	2023-10-06 15:26:16 -04:00
Rachid Mrad	5ab4a2fde9	edit documentation	2023-10-06 15:12:39 -04:00
Rachid Mrad	8424e20195	edit users filter	2023-10-06 14:20:22 -04:00
Cameron Dixon	30cba83e8e	Merge pull request #1113 from cisagov/h-m-f-t-patch-1 ... Update issue template to add A/C and clarity	2023-10-06 11:36:00 -04:00
Cameron Dixon	bf622b5e50	another attempt at placeholder text with tasks	2023-10-06 09:19:28 -04:00
Cameron Dixon	83844fc2f8	remove quotes	2023-10-06 09:13:12 -04:00
Cameron Dixon	bf5d254b83	re-add emoji	2023-10-06 09:12:16 -04:00
Erin	c99588687f	Remove ~	2023-10-05 13:40:42 -07:00
Erin	6a53a4a76b	Update tests	2023-10-05 13:38:08 -07:00
Erin	8c6b4f51e8	Rename block titles	2023-10-05 13:30:39 -07:00
Erin	687f369d18	Rename Security Email page title	2023-10-05 13:14:27 -07:00
Erin	611242b74a	Rename Contact Information page title	2023-10-05 13:13:44 -07:00
Erin	bd90b9a974	Rename Domain Nameservers page title	2023-10-05 13:13:01 -07:00
zandercymatics	aa3d42cb09	Merge branch 'rjm/1027-groups-permissions-logging' into za/937-invitation-does-not-work	2023-10-05 11:42:34 -06:00
zandercymatics	8f349aa19c	Update domain.py	2023-10-05 11:29:05 -06:00
zandercymatics	af39441df4	Lint	2023-10-05 08:58:46 -06:00
zandercymatics	a58cff8398	Update content	2023-10-05 08:47:18 -06:00
Cameron Dixon	04d6a1204a	fix note with markdown type instead of textarea	2023-10-05 10:25:51 -04:00
Cameron Dixon	bfda399e3d	remove attempt to placeholder task list formatting	2023-10-05 10:18:59 -04:00
Cameron Dixon	d394a08850	replace value/task list formatting with placeholder	2023-10-05 10:18:03 -04:00
Cameron Dixon	f221ef1b36	respond to feedback and add placeholder/value attributes	2023-10-05 10:14:30 -04: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	06d31a07e1	Merge pull request #1048 from cisagov/za/850-epp-contact-get ... Tickets #850, #912 - Epp Contact Getters / Security Contact Getter+Setter	2023-10-04 10:47:01 -06:00
zandercymatics	41eab0d3a7	Fix verbiage	2023-10-04 10:31:59 -06: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
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
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
rachidatecs	234a6e31d3	Update docs/developer/user-permissions.md ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2023-10-03 18:40:03 -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	a708bd117c	Merge pull request #1121 from cisagov/ab/add-kristina-to-fixtures ... add kristina to fixtures	2023-10-03 14:14:04 -07: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