9356 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Kennedy	471388ddf8	formatting removing spaces	2024-11-26 20:06:52 -05:00
David Kennedy	9c0a7e15e8	added some additional test code to boost coverage, fixed is_portfolio_admin, and formatting	2024-11-26 19:56:46 -05:00
David Kennedy	bcd4e57b4c	merge main	2024-11-20 15:37:58 -05:00
dave-kennedy-ecs	5b7a6678c6	Merge pull request #3094 from cisagov/bob/2899-suppress-blue-box ... #2899: don't show blue box when analyst clicks 'Manage Domain'	2024-11-20 15:33:53 -05:00
Rebecca H.	3bba70ca35	Merge pull request #3100 from cisagov/rh/fix-domain-request-deletion ... Bug Fix: New Domain Request Deletion Error - [RH]	2024-11-20 12:17:40 -08:00
Rebecca Hsieh	46d3f9f0b4	Fix bug where domain request could not delete	2024-11-20 10:32:22 -08:00
Rachid Mrad	8eb5528304	Merge pull request #3072 from cisagov/cb/2494-banner-boilerplates ... #2494: Banner boilerplates - [CB]	2024-11-20 13:08:30 -05:00
Rachid Mrad	6bba76c092	merge main	2024-11-20 12:37:42 -05:00
Rachid Mrad	fc53832c56	Merge pull request #3071 from cisagov/rjm/2941-dja-table-headers ... #2941: Add a th with text Action for the DJA table rows that have copy buttons - [RJM]	2024-11-20 12:36:07 -05:00
David Kennedy	bc855de792	merge	2024-11-20 12:05:32 -05:00
Rebecca H.	11db76496a	Merge pull request #2968 from cisagov/rh/2764-kebob-extra-spicy ... #2764: Adding Kebabs + Delete Functionality + Modals for the Members Table and Member Profile Page - [RH]	2024-11-19 14:56:12 -08: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
David Kennedy	6a0c483288	formatted code for readability	2024-11-18 14:11:30 -05:00
David Kennedy	051efe798d	oops undo accidental commit	2024-11-18 14:07:34 -05:00
David Kennedy	ddb7ed2d6c	added logic to not display blue info box in certain condition, and added test	2024-11-18 13:59:20 -05:00
David Kennedy	8f18a409ea	added logic to not display blue info box in certain condition, and added test	2024-11-18 13:51:39 -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
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
David Kennedy	9ee9e94405	Merge branch 'main' into dk/2730-domain-overview	2024-11-18 12:34:46 -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
David Kennedy	837d618015	linted some more	2024-11-15 08:52:50 -05:00
David Kennedy	a09a53e600	updated view tests, and linted	2024-11-15 08:45:54 -05:00
David Kennedy	17fa1ae008	view / manage button on suborganization section	2024-11-15 08:20:17 -05:00
David Kennedy	6f0bc4ce6c	unit test	2024-11-15 07:21:20 -05:00