Commit graph

9339 commits

Author SHA1 Message Date
CocoByte
a64a85b1fe
cleanup 2024-11-19 22:49:36 -07:00
CocoByte
84bb88a0a4
linted again 2024-11-19 22:09:43 -07:00
CocoByte
a151f7d135
resolve merge conflicts 2024-11-19 21:53:31 -07:00
CocoByte
c75b6043fd
linting, cleanup, initial unit tests 2024-11-19 21:51:36 -07: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
CocoByte
bc8df41001
linted 2024-11-19 11:02:55 -07:00
CocoByte
cc4a52c32a
frontend updates. Code cleanup 2024-11-18 14:18:20 -07: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
CocoByte
6dc7d6f673
Validation complete, but it is firing twice. Need to fix that 2024-11-18 11:32:47 -07: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
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
CocoByte
a94332ff6b
modal logic complete. Needs css updates and need to finish backend logic 2024-11-14 14:52:57 -07:00
CocoByte
eeb5727081
validation working. Just need to clean things up and open the modal using built in functionality 2024-11-14 14:42:19 -07: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