Commit graph

10978 commits

Author SHA1 Message Date
zandercymatics
d3bac5a06a
Merge pull request #3408 from cisagov/za/3317-hide-org-federal-agencies
#3317: Don't allow non-org model domain requests for federal agencies in a portfolio [ZA]
2025-02-04 14:52:10 -07:00
zandercymatics
0d1af72e23
Merge branch 'main' into za/3317-hide-org-federal-agencies 2025-02-04 14:38:10 -07:00
zandercymatics
7c613a01f8
revert db_helpers change 2025-02-04 13:52:40 -07:00
zandercymatics
9bf152a8fc
unit test 2025-02-04 13:18:24 -07:00
Matt-Spence
ddcd9fa310
Merge branch 'main' into ms/3125-fix-sandbox-log-output 2025-02-04 13:41:14 -05:00
Alysia Broddrick
cbb8e58df4
Merge pull request #3437 from cisagov/ab/remove-domain-request-endpoint
remove domain request endpoint [ab]
2025-02-04 10:39:55 -08:00
David Kennedy
3f7d1b0524
unblock invitation when previously retrieved invitation 2025-02-04 12:24:46 -05:00
David Kennedy
b1f2dddd99
fixed portfolio members table, assigned domains 2025-02-04 12:16:28 -05:00
zandercymatics
05bf5d090e
Merge branch 'main' into za/3317-hide-org-federal-agencies 2025-02-04 10:00:40 -07:00
Alysia Broddrick
ba85fa581b
Merge branch 'main' into ab/remove-domain-request-endpoint 2025-02-04 09:00:06 -08:00
zandercymatics
367b2b8043
Requested changes 2025-02-04 09:58:17 -07:00
Matt-Spence
42ed097f1e
Merge branch 'main' into ms/3125-fix-sandbox-log-output 2025-02-04 11:53:23 -05:00
dave-kennedy-ecs
9fb58903fa
Merge pull request #3451 from cisagov/hotgov/3387-members-tab
#3387 - Members link in header only shows with permissions
2025-02-04 11:50:20 -05:00
Alysia Broddrick
65910a5c04
Merge remote-tracking branch 'origin' into ab/remove-domain-request-endpoint 2025-02-04 08:39:33 -08:00
asaki222
1a3e83b507
removed script link 2025-02-04 10:49:12 -05:00
asaki222
89ab3e8037
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/2719-action-non-production-sandbox 2025-02-04 10:46:44 -05:00
asaki222
5bd8ec6761
changed the file path 2025-02-04 10:46:23 -05:00
asaki222
62e7b09144
fixed typos 2025-02-04 09:49:42 -05:00
asaki222
394fc265d7
updated script 2025-02-04 09:45:53 -05:00
David Kennedy
cdbffa395c
canceled and retrieved domain invitations not displayed in domain overview 2025-02-04 07:20:33 -05:00
David Kennedy
f9e796df72
added migration 2025-02-04 06:19:19 -05:00
David Kennedy
a8fa08acb2
combined suborg and portfolio permissions 2025-02-04 06:14:15 -05:00
David Kennedy
8a82256206
update header and test 2025-02-04 05:13:58 -05:00
David Kennedy
c1c4ec01f0
Merge branch 'main' into bob/2416-portfolio-admin-emails 2025-02-04 04:13:12 -05:00
Erin Song
0cf6899005
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/3285-delete-manager-email 2025-02-03 16:07:06 -08:00
Rachid Mrad
d8d9475938
Merge pull request #3393 from cisagov/rjm/3318-remove-from-domains-if-removed-from-portfolio
#3318: Remove from portfolio triggers remove from domains - [RJM]
2025-02-03 18:40:13 -05:00
Rachid Mrad
3867910d05
Merge branch 'main' into rjm/3318-remove-from-domains-if-removed-from-portfolio 2025-02-03 18:25:30 -05:00
Rachid Mrad
cdb1a2dfdb
Merge pull request #3436 from cisagov/staging-hotfix-reports
Staging hotfix: Mixins and decorators on csv reports views
2025-02-03 18:24:58 -05:00
Rachid Mrad
a80ab45401
lint 2025-02-03 18:22:51 -05:00
Rachid Mrad
faf3e833d2
Merge branch 'main' into staging-hotfix-reports 2025-02-03 18:20:32 -05:00
Erin Song
18a40914d0
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/3285-delete-manager-email 2025-02-03 14:49:15 -08:00
Erin Song
4736165d44
Add tests for custome delete page content 2025-02-03 14:48:06 -08:00
zandercymatics
d14a23621e
fix bug 2025-02-03 15:36:45 -07:00
Rachid Mrad
f699c7d0b3
merge main, address bulk deletion in DJA 2025-02-03 16:59:42 -05:00
Erin Song
ffa564b21e
Add requested whitespace 2025-02-03 13:38:45 -08:00
CuriousX
a3f4602824
Merge pull request #3419 from cisagov/nl/3331-tooltip-sizing-correction
#3331 tooltip sizing correction - [NL]
2025-02-03 14:12:22 -07:00
asaki222
9b4ae79170
fixed text 2025-02-03 16:04:18 -05:00
matthewswspence
095f1abbf8
add log format to sandbox template 2025-02-03 15:04:13 -06:00
asaki222
fa27f26942
yaml file and docs 2025-02-03 16:03:18 -05:00
CuriousX
87bc3d47ee
Merge branch 'main' into nl/3331-tooltip-sizing-correction 2025-02-03 14:02:17 -07:00
matthewswspence
a9f2081167
linter fixes 2025-02-03 14:23:06 -06:00
matthewswspence
6987d9022c
Merge remote-tracking branch 'origin/main' into ms/3125-fix-sandbox-log-output 2025-02-03 14:22:24 -06:00
Rachid Mrad
14c68c1f1f
Merge pull request #3428 from cisagov/hotgov/3402-invitation-updates
#3402: Portfolio and domain invitation updates [HOTGOV]
2025-02-03 15:01:19 -05:00
zandercymatics
8419d22f67
Merge branch 'main' into za/3317-hide-org-federal-agencies 2025-02-03 13:00:14 -07:00
Rachid Mrad
1a811dc274
Merge branch 'main' into staging-hotfix-reports 2025-02-03 14:30:41 -05:00
Rachid Mrad
e904c4bcda
Merge branch 'main' into hotgov/3402-invitation-updates 2025-02-03 13:31:57 -05:00
CuriousX
7ccca0ac72
Merge branch 'main' into nl/3331-tooltip-sizing-correction 2025-02-03 11:10:39 -07:00
Rachid Mrad
0774355243
Merge pull request #3422 from cisagov/rjm/3048-request-table-accessibility
#3048: Request table accessibility issues - [RJM]
2025-02-03 13:05:45 -05:00
CuriousX
0681b42c54
Merge branch 'main' into nl/3331-tooltip-sizing-correction 2025-02-03 11:02:59 -07:00
Rachid Mrad
268b381be5
Merge branch 'main' into rjm/3048-request-table-accessibility 2025-02-03 12:28:11 -05:00