9285 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Matthew Spence	1d08f52447	Merge remote-tracking branch 'origin' into ms/2826-self-host-select2	2024-11-19 11:38:47 -06:00
asaki222	bb58b77467	Merge pull request #3069 from cisagov/ad/1604-allow-analysts-to-view-cancelled-invitations ... #1604 allow analysts to view cancelled invitations - [AD]	2024-11-18 16:04:43 -05:00
asaki222	616167a63b	fixed typo	2024-11-18 15:40:38 -05:00
asaki222	629419f141	Merge branch 'ad/1604-allow-analysts-to-view-cancelled-invitations' of https://github.com/cisagov/manage.get.gov into meoward/1604-allow-analysts-to-view-cancelled-invitations	2024-11-18 15:38:12 -05:00
asaki222	443c200f91	updated text	2024-11-18 15:37:56 -05:00
asaki222	a43668a4b9	Update src/registrar/views/domain.py ... Co-authored-by: Matt-Spence <matthewswSpence@gmail.com>	2024-11-18 15:37:26 -05:00
asaki222	f8e404860e	Update src/registrar/models/domain_invitation.py ... Co-authored-by: Matt-Spence <matthewswSpence@gmail.com>	2024-11-18 15:34:06 -05:00
asaki222	aa18afc9e1	made changes for the linter	2024-11-18 14:17:58 -05:00
asaki222	2a228054cf	updated for merge conflicts	2024-11-18 13:43:37 -05:00
asaki222	d6ee1d4242	updates	2024-11-18 13:10:48 -05:00
Matthew Spence	55ce772b15	self host select2	2024-11-18 12:05:40 -06:00
asaki222	fdbac80a31	Merge branch 'ad/1604-allow-analysts-to-view-cancelled-invitations' of https://github.com/cisagov/manage.get.gov into meoward/1604-allow-analysts-to-view-cancelled-invitations	2024-11-18 12:53:02 -05:00
asaki222	96a129da9e	Merge branch 'main' into ad/1604-allow-analysts-to-view-cancelled-invitations	2024-11-18 12:49:47 -05:00
asaki222	94b3651623	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into meoward/1604-allow-analysts-to-view-cancelled-invitations	2024-11-18 12:48:33 -05:00
asaki222	fdbcd99bfe	add error	2024-11-18 12:43:10 -05:00
dave-kennedy-ecs	7c5b56d7b3	Merge pull request #3078 from cisagov/bob/2728-domain-manager-page-updates ... #2728: domain manager page updates	2024-11-18 12:32:52 -05:00
David Kennedy	9c671c0f71	fixed outstanding copy, and updated comment	2024-11-18 12:27:05 -05:00
David Kennedy	208e63682c	Merge branch 'main' into bob/2728-domain-manager-page-updates	2024-11-18 12:08:28 -05:00
dave-kennedy-ecs	68dc4942a8	Merge pull request #3040 from cisagov/dk/2934-dja-domain-request ... #2934: Django Admin - Dynamic Domain Request edit page	2024-11-18 12:05:52 -05:00
David Kennedy	0a11dff347	Merge branch 'main' into dk/2934-dja-domain-request	2024-11-18 11:57:22 -05:00
asaki222	0d3440ee49	make migration	2024-11-18 11:47:40 -05:00
asaki222	736faf34fc	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into meoward/1604-allow-analysts-to-view-cancelled-invitations	2024-11-18 11:09:11 -05:00
asaki222	1b0389b6dd	changes	2024-11-18 10:51:08 -05:00
asaki222	e016561e03	removed update	2024-11-18 10:30:12 -05:00
asaki222	1dfab094ab	some extra text	2024-11-18 10:17:14 -05:00
Matt-Spence	2a4824975b	Merge pull request #3090 from cisagov/ms/2999-update-workflow-permissions ... HOTFIX #3003 Update Workflow Permissions	2024-11-15 19:04:56 -05:00
David Kennedy	af10118803	fixing a bug in suborganization handling	2024-11-15 18:36:16 -05:00
Matthew Spence	e61b1b7932	swap permissions	2024-11-15 17:29:10 -06:00
David Kennedy	654df17131	fixing a bug in suborganization handling	2024-11-15 18:24:13 -05:00
Matt-Spence	08ad55a5a9	Merge pull request #3086 from cisagov/ms/2999-update-workflow-permissions ... #3003: remove monitor and add specific permissions	2024-11-15 12:20:53 -05:00
Matt-Spence	116877b0af	Remove typo	2024-11-15 11:31:43 -05:00
Matthew Spence	a88b5bf635	remove monitor and add specific permissions	2024-11-15 09:57:14 -06:00
asaki222	2d4f092900	reformmated	2024-11-14 17:22:20 -05:00
Matt-Spence	a872893d00	Merge pull request #3061 from cisagov/ms/2903-clone-stable-to-staging ... #2903: Target Stable/Staging for Clone Workflow	2024-11-14 17:08:11 -05:00
Matthew Spence	40b9b4b973	Merge remote-tracking branch 'origin' into ms/2903-clone-stable-to-staging	2024-11-14 16:07:12 -06:00
Matt-Spence	a76e783115	Merge pull request #3081 from cisagov/ms/remove-monitor-from-deploy ... HOTFIX: remove monitor from deploy jobs	2024-11-14 16:21:32 -05:00
asaki222	199c38c32f	merge conflict	2024-11-14 16:12:57 -05:00
asaki222	08b9de2dce	delete the deleteinvitationdelete view and added print statements to test	2024-11-14 15:44:46 -05:00
asaki222	9fc1b46828	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into ad/1604-allow-analysts-to-view-cancelled-invitations	2024-11-14 15:27:47 -05:00
Matt-Spence	ab0617a452	Update deploy-staging.yaml	2024-11-14 13:11:06 -06:00
Matt-Spence	e3a13bccf1	Update deploy-stable.yaml	2024-11-14 13:10:52 -06:00
Matt-Spence	9dbe9a4cb4	Update deploy-sandbox.yaml	2024-11-14 13:10:35 -06:00
Matt-Spence	7594e469e4	Update deploy-manual.yaml	2024-11-14 13:10:19 -06:00
Matt-Spence	8847799156	Update deploy-development.yaml	2024-11-14 13:09:38 -06:00
Matt-Spence	a3ffae28ec	Update clone-db.yaml	2024-11-14 12:39:48 -06:00
Matt-Spence	c3fb2dd99c	Update clone-db.yaml	2024-11-14 10:24:21 -06:00
Matt-Spence	13d61fa40b	Merge pull request #3073 from cisagov/ms/2999-add-monitor-to-workflows ... #2999: add monitor to workflows - MS	2024-11-14 11:17:13 -05:00
zandercymatics	764ad7acee	Merge pull request #3017 from cisagov/za/2927-blocked-from-starting-requests ... #2927: Blocked from starting a new domain request when there are other started domain requests - [MEOWARD]	2024-11-14 08:33:50 -07:00
zandercymatics	cea4ba5851	Merge branch 'main' into za/2927-blocked-from-starting-requests	2024-11-14 08:12:05 -07:00
David Kennedy	224fe120af	added unit test	2024-11-14 06:10:01 -05:00