Commit graph

9848 commits

Author SHA1 Message Date
zandercymatics
c5184e5b29
Merge branch 'main' into za/2756-edit-member-access 2024-12-16 13:23:30 -07:00
Erin Song
af7561af51
Merge pull request #3219 from cisagov/es/3160-confirmation-page-content
3160: Update confirmation page content on org model view [meoward]
2024-12-16 11:30:08 -08:00
Erin Song
1558358bce
Update domain request content 2024-12-16 11:24:20 -08:00
Erin Song
001d7111db
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/3160-confirmation-page-content 2024-12-16 11:16:51 -08:00
Matt-Spence
c02b036301
Merge pull request #3185 from cisagov/ms/2823-update-delete-domain-process
#2823: update delete domain process - [MS]
2024-12-16 14:04:47 -05:00
Matt-Spence
8016dd96c2
Merge branch 'main' into ms/2823-update-delete-domain-process 2024-12-16 13:59:57 -05:00
Erin Song
91740c9026
Apply suggestions from code review
Add suggested commas

Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
2024-12-16 10:20:08 -08:00
dave-kennedy-ecs
1c054ebf1e
Merge pull request #3215 from cisagov/dk/2867-domain-information-admin-changes
#2867: Domain information admin changes for portfolio fields
2024-12-16 13:18:48 -05:00
David Kennedy
49ff001aac
Merge branch 'main' into dk/2867-domain-information-admin-changes 2024-12-16 13:14:28 -05:00
matthewswspence
f039f315e0
linter fixes 2024-12-16 10:35:34 -06:00
matthewswspence
0178d57499
linter fixes 2024-12-16 10:28:55 -06:00
Matthew Spence
f2d7be10b4
Merge remote-tracking branch 'origin' into ms/2823-update-delete-domain-process 2024-12-13 16:37:26 -06:00
Matthew Spence
bb2072debc
log exception in nameserver setter. 2024-12-13 16:35:29 -06:00
Matthew Spence
db4f9c54ef
Merge branch 'ms/2823-update-delete-domain-process' of https://github.com/cisagov/manage.get.gov into ms/2823-update-delete-domain-process 2024-12-13 16:21:33 -06:00
zandercymatics
88c717be9a
Update src/registrar/templates/portfolio_member_permissions.html 2024-12-13 15:06:13 -07:00
zandercymatics
3839cbafd0
fix bug on no-organization-domains 2024-12-13 14:43:14 -07:00
zandercymatics
053fc23173
fix test 2024-12-13 14:29:32 -07:00
matthewswspence
32789faec6
review changes and linting 2024-12-13 15:27:57 -06:00
Matthew Spence
21007ce869
review changes 2024-12-13 15:23:15 -06:00
zandercymatics
b5464a9da8
lintomatic 2024-12-13 14:12:00 -07:00
zandercymatics
c551a60e3a
Add Unit tests 2024-12-13 12:29:08 -07:00
zandercymatics
24480ec434
Polish of paint 2024-12-13 11:54:52 -07:00
zandercymatics
d2149484c9
fix tests + cleanup 2024-12-13 11:31:22 -07:00
zandercymatics
d52a44a744
the perpetual struggle 2024-12-13 10:44:32 -07:00
zandercymatics
d48c140177
cleanup 2024-12-13 09:53:44 -07:00
zandercymatics
ba170c30e1
Merge branch 'main' into za/2756-edit-member-access 2024-12-13 09:34:10 -07:00
zandercymatics
2d0c4e7b1d
Update portfolios.py 2024-12-12 15:40:36 -07:00
zandercymatics
f6e95cc4f8
Add stub for email adding 2024-12-12 15:14:05 -07:00
Matthew Spence
63c2b7907f
clean up 2024-12-12 15:33:50 -06:00
matthewswspence
1fb8b222c4
pushing changes to pull on another device 2024-12-12 15:31:40 -06:00
Erin Song
a7cab25390
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/3160-confirmation-page-content 2024-12-12 13:17:00 -08:00
dave-kennedy-ecs
6f6beef6e4
Merge pull request #3198 from cisagov/rjm/2768-edit-member-domains
#2768: Edit member domains - [RJM]
2024-12-12 15:49:21 -05:00
David Kennedy
28ad3d7f10
Merge branch 'main' into rjm/2768-edit-member-domains 2024-12-12 15:31:54 -05:00
dave-kennedy-ecs
048b558de6
Update src/registrar/templates/includes/member_domains_edit_table.html
Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
2024-12-12 15:22:23 -05:00
dave-kennedy-ecs
c743648fe0
Update src/registrar/assets/src/js/getgov/table-edit-member-domains.js
Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
2024-12-12 15:21:28 -05:00
zandercymatics
d7ec32d898
Rework NewMemberView (will readd email logic) 2024-12-12 13:15:27 -07:00
matthewswspence
51da456f02
fix tests 2024-12-12 13:45:36 -06:00
Erin Song
a940fa673d
Update domain request confirmation page content for org model 2024-12-11 15:01:11 -08:00
Cameron Dixon
ab59b7a127
Merge pull request #3218 from cisagov/update-issue
Add story info to issue template
2024-12-11 16:25:07 -05:00
Cameron Dixon
c69cfd72f3
Update issue-default.yml 2024-12-11 16:17:46 -05:00
zandercymatics
6662d82539
Consolidate js 2024-12-11 14:03:38 -07:00
zandercymatics
9fe87fbba1
wrap up js 2024-12-11 13:51:18 -07:00
zandercymatics
4f3663efa0
Fix js 2024-12-11 13:31:33 -07:00
matthewswspence
533e57722f
refactor delete to use same logic as nameserver setter 2024-12-11 14:30:58 -06:00
zandercymatics
0ab963db1e
Consolidate 2024-12-11 13:21:22 -07:00
zandercymatics
2bc8d38002
add logic for invitation 2024-12-11 12:57:57 -07:00
David Kennedy
30c15fa817
js cleanup 2024-12-11 14:38:14 -05:00
David Kennedy
e0eb70abe2
working _delete_domain 2024-12-11 14:12:42 -05:00
Rachid Mrad
bc6c756aab
Fix unit tests 2024-12-11 13:36:54 -05:00
CuriousX
c0f0cf8cff
Merge pull request #3213 from cisagov/nl/3210-fix-converted-federal-agency-none-check
#3210 - Fix converted_federal_agency in domain information
2024-12-11 11:14:49 -07:00