Erin Song
|
04a08e19dd
|
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/3285-delete-manager-email
|
2025-02-06 12:00:11 -08:00 |
|
Erin Song
|
ba9deb7a93
|
Move admin tests to admin.py
|
2025-02-06 12:00:08 -08:00 |
|
Matt-Spence
|
5277e8470b
|
Merge pull request #3298 from cisagov/ms/3125-fix-sandbox-log-output
#3125: Remove JSON formatting from Non-Error logs - [KO]
|
2025-02-06 14:31:34 -05:00 |
|
Matt-Spence
|
37d160bd1e
|
Merge branch 'main' into ms/3125-fix-sandbox-log-output
|
2025-02-06 14:05:58 -05:00 |
|
dave-kennedy-ecs
|
5aebbb4609
|
Merge pull request #3441 from cisagov/bob/2416-portfolio-admin-emails
#2416: portfolio admin notification emails
|
2025-02-06 13:59:45 -05:00 |
|
David Kennedy
|
05aca45890
|
Merge branch 'main' into bob/2416-portfolio-admin-emails
|
2025-02-06 13:51:42 -05:00 |
|
zandercymatics
|
38e6b06d3c
|
Merge pull request #3430 from cisagov/za/3145-use-transaction-atomic
#3145: Change usage of transaction.atomic() to be inside try/catch instead of outside of it [litterbox]
|
2025-02-06 11:48:11 -07:00 |
|
zandercymatics
|
c80348b1c8
|
Update src/registrar/fixtures/fixtures_portfolios.py
|
2025-02-06 11:33:20 -07:00 |
|
David Kennedy
|
cf516778a3
|
Merge branch 'main' into bob/2416-portfolio-admin-emails
|
2025-02-06 13:26:23 -05:00 |
|
Matt-Spence
|
ae20ab27a3
|
Merge branch 'main' into ms/3125-fix-sandbox-log-output
|
2025-02-06 13:04:23 -05:00 |
|
zandercymatics
|
725a229278
|
Merge branch 'main' into za/3145-use-transaction-atomic
|
2025-02-06 09:09:45 -07:00 |
|
dave-kennedy-ecs
|
61b1174934
|
Merge pull request #3452 from cisagov/meoward/3429-suborg-permissions
#3429: combined suborg and portfolio permissions [MIGRATION] [MEOWARD]
|
2025-02-06 04:35:00 -05:00 |
|
David Kennedy
|
4b750fbc7f
|
Merge branch 'main' into meoward/3429-suborg-permissions
|
2025-02-06 04:26:18 -05:00 |
|
Cameron Dixon
|
3dad0d4b4c
|
Merge pull request #3460 from cisagov/remove-story
Remove the "story" issue template
|
2025-02-05 22:09:13 -05:00 |
|
zandercymatics
|
c8217d7f53
|
remove unused imports
|
2025-02-05 15:39:54 -07:00 |
|
David Kennedy
|
63e82c9a3c
|
Merge branch 'main' into meoward/3429-suborg-permissions
|
2025-02-05 16:47:50 -05:00 |
|
David Kennedy
|
120650895a
|
normalized more portfolio permission names
|
2025-02-05 16:42:56 -05:00 |
|
Matt-Spence
|
4b6528166f
|
Merge branch 'main' into ms/3125-fix-sandbox-log-output
|
2025-02-05 15:07:21 -05:00 |
|
Cameron Dixon
|
2bdd1cf71e
|
Delete story.yml
|
2025-02-05 14:34:34 -05:00 |
|
zandercymatics
|
c2eacbfcdb
|
Remove transaction.atomic() from fixtures
|
2025-02-04 15:15:02 -07:00 |
|
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 |
|
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 |
|
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 |
|
matthewswspence
|
095f1abbf8
|
add log format to sandbox template
|
2025-02-03 15:04:13 -06:00 |
|
CuriousX
|
87bc3d47ee
|
Merge branch 'main' into nl/3331-tooltip-sizing-correction
|
2025-02-03 14:02:17 -07:00 |
|