Commit graph

10772 commits

Author SHA1 Message Date
zandercymatics
e270b8dbe0
Merge branch 'main' into za/3317-hide-org-federal-agencies 2025-02-03 08:12:30 -07:00
dave-kennedy-ecs
998cd458af
Merge pull request #3420 from cisagov/dk/3353-duplicate-users
#3353: handle multiple login.gov accounts with same email address
2025-01-31 13:26:55 -05:00
David Kennedy
7a13c17e3c
cleanup extra print statement 2025-01-31 13:10:22 -05:00
David Kennedy
fe07d3114c
Merge branch 'main' into dk/3353-duplicate-users 2025-01-31 13:08:02 -05:00
Rachid Mrad
54dfead107
Merge pull request #3424 from cisagov/rb/3417-dja-header-bug
#2417: Fix header colors in DJA - [RB]
2025-01-31 12:54:20 -05:00
Rachid Mrad
9c814dec0f
Merge branch 'main' into rb/3417-dja-header-bug 2025-01-31 12:33:38 -05:00
zandercymatics
f1005f5f62
Merge branch 'main' into za/3317-hide-org-federal-agencies 2025-01-31 08:28:44 -07:00
dave-kennedy-ecs
73e0cb5adc
Merge pull request #3399 from cisagov/meoward/3360-member-permissions
#3360: Member permissions changes
2025-01-30 14:12:31 -05:00
David Kennedy
aa7959c351
update to scss 2025-01-30 14:06:57 -05:00
David Kennedy
fb8634cae0
Merge branch 'main' into meoward/3360-member-permissions 2025-01-30 14:04:23 -05:00
David Kennedy
56475ec09d
cleanup from PR 2025-01-30 14:04:16 -05:00
zandercymatics
b24ab81fe4
Merge branch 'main' into za/3317-hide-org-federal-agencies 2025-01-30 08:58:47 -07:00
zandercymatics
714a723231
lint 2025-01-30 08:58:37 -07:00
zandercymatics
59d1301fd7
Update test_views_request.py 2025-01-30 08:40:24 -07:00
dave-kennedy-ecs
dc1322c0ea
Merge pull request #3388 from cisagov/bob/2711-domain-mgr-remove
#2711: Domain manager view - remove manager when only one manager
2025-01-29 17:53:55 -05:00
zandercymatics
cc0c53006c
Update test_forms.py 2025-01-29 15:43:53 -07:00
David Kennedy
3c8e444cea
Merge branch 'main' into bob/2711-domain-mgr-remove 2025-01-29 17:38:03 -05:00
Rachid Mrad
b74dc0ffe1
fix header colors in DJA 2025-01-29 15:19:47 -05:00
zandercymatics
b5935a36d6
lint 2025-01-29 11:10:12 -07:00
Matt-Spence
b18d126b7f
Merge pull request #3411 from cisagov/documentation-for-cloning-workflow
Documentation for cloning workflow
2025-01-29 12:32:02 -05:00
matthewswspence
587feba98a
whitespace changes to trigger workflows 2025-01-29 11:23:11 -06:00
Matt-Spence
cd2c1eb404
Merge branch 'main' into documentation-for-cloning-workflow 2025-01-29 12:18:30 -05:00
David Kennedy
30fcbb5101
updated fixtures 2025-01-29 07:50:35 -05:00
David Kennedy
e44ef70b89
Merge branch 'main' into dk/3353-duplicate-users 2025-01-29 05:30:15 -05:00
David Kennedy
ff959ce519
update logic for oidc backend and update tests 2025-01-29 05:15:44 -05:00
zandercymatics
4dba0a31c3
remove test code and lint 2025-01-28 15:15:56 -07:00
zandercymatics
bc7bc4d6e1
Merge pull request #3325 from cisagov/litterbox/3280-design-review
#3280: Review member permissions in registrar [LITTERBOX]
2025-01-28 15:12:30 -07:00
zandercymatics
6f39eac5fb
Merge branch 'main' into litterbox/3280-design-review 2025-01-28 15:03:28 -07:00
zandercymatics
583a7d94a5
Merge pull request #3404 from cisagov/za/create-federal-portfolio-force-create-suborg
Create federal portfolio script: Force create suborganizations
2025-01-28 15:01:32 -07:00
zandercymatics
d68a3380c3
Remove tabindex 2025-01-28 14:55:37 -07:00
zandercymatics
163df2e390
Merge branch 'main' into za/create-federal-portfolio-force-create-suborg 2025-01-28 14:47:57 -07:00
zandercymatics
6c5da74f6e
Update test_management_scripts.py 2025-01-28 14:47:53 -07:00
zandercymatics
e7243b789e
PR suggestions 2025-01-28 14:44:50 -07:00
zandercymatics
ad2c04d330
Merge branch 'main' into litterbox/3280-design-review 2025-01-28 14:40:12 -07:00
zandercymatics
0478d2bee6
Fix unit tests 2025-01-28 14:36:40 -07:00
David Kennedy
9f47296f26
merge main 2025-01-28 16:28:44 -05:00
dave-kennedy-ecs
5b6776f81d
Merge pull request #3410 from cisagov/dk/3076-portfolio-model-save
#3076: update to portfolio model and associated tests
2025-01-28 16:14:00 -05:00
David Kennedy
7f8a12f3b4
Merge branch 'main' into dk/3076-portfolio-model-save 2025-01-28 15:46:54 -05:00
CuriousX
093203e848
Merge pull request #3340 from cisagov/nl/3275-slowness-admin-tables
#3275: Slowness on Domain, Domain Info and Domain Requests - [NL]
2025-01-28 12:25:04 -07:00
CuriousX
0881cf2fc6
Merge branch 'main' into nl/3275-slowness-admin-tables 2025-01-28 12:14:06 -07:00
Erin Song
182c26e1f5
Merge pull request #3355 from cisagov/es/3175-email-updates
3175: Domain request email template updates [ES]
2025-01-28 10:52:23 -08:00
zandercymatics
7b2db4b850
Update create_federal_portfolio.py 2025-01-28 11:43:10 -07:00
Erin Song
587621380c
Change Requested by field from name to email 2025-01-28 10:36:59 -08:00
CocoByte
ab634516e9
fix 2025-01-28 11:27:33 -07:00
Erin Song
4bdb7715a4
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/3175-email-updates 2025-01-28 10:23:17 -08:00
CocoByte
bc2ffb3f70
linted 2025-01-28 10:47:24 -07:00
CuriousX
b124c1bb11
Update src/registrar/admin.py
Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
2025-01-28 10:45:41 -07:00
CuriousX
c496d0102e
Update src/registrar/admin.py
Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
2025-01-28 10:45:32 -07:00
zandercymatics
ad79557a55
lint and fix test 2025-01-28 09:58:41 -07:00
zandercymatics
8504eb1f39
Merge branch 'main' into za/3317-hide-org-federal-agencies 2025-01-28 09:57:30 -07:00