Commit graph

12132 commits

Author SHA1 Message Date
zandercymatics
d07fab387a
Merge pull request #3706 from cisagov/backup/3622-warn-org-admins
#3622: Members page, warn org admins when they are modifying themselves - [BACKUP]
2025-03-28 07:58:35 -06:00
zandercymatics
4df413fb1e
Merge branch 'main' into backup/3622-warn-org-admins 2025-03-27 14:35:51 -06:00
zandercymatics
a2cba301a5
Update portfolio_member_permissions.html 2025-03-27 13:43:50 -06:00
Slim
24bef969a3
Merge pull request #3694 from cisagov/rh/3597-same-name-domain
#3596: Changes to approving domain with same name - [RH]
2025-03-27 12:19:11 -07:00
zandercymatics
accda363cb
fix bad redirect url bug 2025-03-27 12:40:00 -06:00
Rebecca Hsieh
bb668d5ef1
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3597-same-name-domain 2025-03-27 11:21:10 -07:00
zandercymatics
7e8aad82f0
Fix bug with info dialog appearing on the wrong page 2025-03-27 12:10:18 -06:00
Rebecca Hsieh
a54eb92eee
Fix unit tests 2025-03-27 10:55:52 -07:00
Matt-Spence
51248c4f6e
Merge pull request #3682 from cisagov/ab/3599-permissions-tests
#3599: New permissions tests - [AB]
2025-03-27 13:51:09 -04:00
Rebecca Hsieh
13c3051aa8
Fix ispendingdelete logic 2025-03-27 10:38:39 -07:00
matthewswspence
f12783bca6
linter fixes 2025-03-27 12:21:09 -05:00
zandercymatics
58af877ca1
Update portfolio-member-page.js 2025-03-27 11:19:28 -06:00
Matt-Spence
72c3f6c371
Merge branch 'main' into ab/3599-permissions-tests 2025-03-27 13:15:34 -04:00
zandercymatics
c0b68eebe8
Update portfolio-member-page.js 2025-03-27 11:07:28 -06:00
zandercymatics
e520986ae1
Merge pull request #3673 from cisagov/litterbox/3418-refactor-create-federal-portfolio
#3418: Refactor create federal portfolio - [LITTERBOX]
2025-03-27 10:22:26 -06:00
matthewswspence
541008d9f1
review changes 2025-03-27 10:52:26 -05:00
matthewswspence
7c9ca52867
add extra handling 2025-03-27 10:49:14 -05:00
Matt-Spence
4e0a9c0b3d
Merge branch 'main' into ab/3599-permissions-tests 2025-03-27 11:32:44 -04:00
Rebecca Hsieh
5d53f5b9b2
Adding in the pendingDelete force state which will be removed 2025-03-27 07:36:43 -07:00
Rebecca Hsieh
848a1a2e57
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3597-same-name-domain 2025-03-27 07:36:22 -07:00
zandercymatics
0f1509fe73
Merge branch 'main' into backup/3622-warn-org-admins 2025-03-27 08:31:07 -06:00
zandercymatics
befdbc045e
Merge branch 'main' into litterbox/3418-refactor-create-federal-portfolio 2025-03-27 08:25:27 -06:00
dave-kennedy-ecs
146a5558aa
Merge pull request #3689 from cisagov/dk/3532-epplibwrapper-error
#3532: EPP error message handling and retry on Registrar not logged in
2025-03-26 19:29:23 -04:00
David Kennedy
6927d9c5b7
Merge branch 'main' into dk/3532-epplibwrapper-error 2025-03-26 19:19:47 -04:00
David Kennedy
72f256e0b8
split message and apply to more scenarios 2025-03-26 18:32:59 -04:00
Rebecca Hsieh
3e98742a13
Have a try catch for registry error 2025-03-26 13:11:54 -07:00
zandercymatics
24333b9b1e
Merge branch 'main' into backup/3622-warn-org-admins 2025-03-26 13:33:54 -06:00
zandercymatics
7a42b913ed
lint 2025-03-26 13:11:04 -06:00
zandercymatics
3bf3c5a8a6
Merge branch 'za/3622-warn-org-admins' into backup/3622-warn-org-admins 2025-03-26 12:15:00 -06:00
zandercymatics
8ee3ba6190
unit tests and lint 2025-03-26 12:14:09 -06:00
zandercymatics
692ed7d358
Merge pull request #3672 from cisagov/hotgov/3585-update-existing-public-contacts
#3585 / #3640: script to update existing public contacts and add search bar and columns to dja tables - [HOTGOV]
2025-03-26 11:23:21 -06:00
zandercymatics
6768caa90e
Update update_default_public_contacts.py 2025-03-26 11:12:13 -06:00
zandercymatics
85666d2e7d
lint and unit tests 2025-03-26 10:54:56 -06:00
zandercymatics
02f833c468
Merge branch 'hotgov/3585-update-existing-public-contacts' of github.com:cisagov/manage.get.gov into hotgov/3585-update-existing-public-contacts 2025-03-26 09:54:08 -06:00
zandercymatics
af22542b94
Add better comment 2025-03-26 09:36:50 -06:00
zandercymatics
db9808ccfd
Update src/registrar/management/commands/update_default_public_contacts.py
Co-authored-by: Rachid Mrad <107004823+rachidatecs@users.noreply.github.com>
2025-03-26 09:32:30 -06:00
zandercymatics
33667b0605
Update src/registrar/management/commands/update_default_public_contacts.py
Co-authored-by: Rachid Mrad <107004823+rachidatecs@users.noreply.github.com>
2025-03-26 09:32:17 -06:00
zandercymatics
91db8d8d50
alert logic 2025-03-26 09:26:37 -06:00
zandercymatics
ce471e54eb
Merge branch 'main' into litterbox/3418-refactor-create-federal-portfolio 2025-03-25 15:03:57 -06:00
Rebecca Hsieh
20c8f97f73
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3597-same-name-domain 2025-03-25 14:01:07 -07:00
zandercymatics
47e59c57da
Merge branch 'main' into hotgov/3585-update-existing-public-contacts 2025-03-25 14:22:57 -06:00
Rebecca Hsieh
0a7610d6e9
Hopefully this will fix the whitespace linter 2025-03-25 13:01:42 -07:00
Rebecca Hsieh
cb5255dd2b
Fix whitespace linting I think 2025-03-25 12:33:54 -07:00
Kristina
d2b090012f
Merge pull request #3695 from cisagov/ky/add-renew-to-req
Update renewal content on requirements pg [KY]
2025-03-25 12:26:32 -07:00
Kristina
e5dd57ae4d
Merge branch 'main' into ky/add-renew-to-req 2025-03-25 12:14:14 -07:00
Rebecca Hsieh
75adddec8a
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/3597-same-name-domain 2025-03-25 11:59:43 -07:00
Rebecca Hsieh
6ac707d47e
Fix spacing and also add in more commenting on the FSM error 2025-03-25 11:55:34 -07:00
Rebecca Hsieh
ee97b5c5a9
Uncomment and leave a note above for the pendingDelete section for ease of testing manually on sandbox 2025-03-25 11:41:31 -07:00
zandercymatics
ae7a3a97ed
change message 2025-03-25 11:56:15 -06:00
zandercymatics
c0ff5fd50d
Merge branch 'main' into hotgov/3585-update-existing-public-contacts 2025-03-25 11:46:15 -06:00