Commit graph

9903 commits

Author SHA1 Message Date
Erin Song
2c04e02c5b
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/2913-domain-request-screenreader 2024-12-20 15:47:39 -08:00
zandercymatics
ecac2c294c
Merge pull request #3243 from cisagov/za/csv-export-hotfix
HOTFIX: #3242 - Revert @property changes in csv_export for current_full.csv and current_federal.csv
2024-12-20 09:26:12 -07:00
zandercymatics
f8ba136fdc
Merge branch 'main' into za/csv-export-hotfix 2024-12-20 09:20:12 -07:00
zandercymatics
5f5ca0b780
Update csv_export.py 2024-12-19 09:25:04 -07:00
zandercymatics
e9d0a54251
Update csv_export.py 2024-12-19 09:20:25 -07:00
zandercymatics
0777cf1334
Comment comet 2024-12-19 09:10:26 -07:00
zandercymatics
f475f4af7f
Merge pull request #3216 from cisagov/za/2756-edit-member-access
Ticket #2756: Edit member access page - [ZA]
2024-12-18 15:08:33 -07:00
zandercymatics
6b2552bdbc
Revert "add zap"
This reverts commit b0cf5df798.
2024-12-18 15:08:05 -07:00
zandercymatics
b0cf5df798
add zap 2024-12-18 15:06:47 -07:00
zandercymatics
fcdc0f0f0f
Fix different ordering 2024-12-18 14:53:17 -07:00
zandercymatics
8b72c654b8
Update csv_export.py 2024-12-18 14:49:28 -07:00
zandercymatics
297be33e64
remove log 2024-12-18 14:42:44 -07:00
zandercymatics
d2d787c8ea
Revert relevant tests back to normal 2024-12-18 14:24:59 -07:00
zandercymatics
431b0e80cf
Revert "Update test_reports.py"
This reverts commit 26fd19ffe8.
2024-12-18 14:21:52 -07:00
zandercymatics
26fd19ffe8
Update test_reports.py 2024-12-18 14:21:06 -07:00
zandercymatics
0cd504eb78
Update csv_export.py 2024-12-18 14:16:17 -07:00
zandercymatics
8bfeedf6ef
remove converted fields 2024-12-18 14:09:09 -07:00
zandercymatics
57c7c6f709
Revert "revert csv-export"
This reverts commit b0d1bc26da.
2024-12-18 13:56:29 -07:00
zandercymatics
dec9e3362d
Condense logic and change names 2024-12-18 13:02:27 -07:00
zandercymatics
a314649de2
Update portfolio.py 2024-12-18 12:33:34 -07:00
zandercymatics
0e1d07d59b
Update portfolio.py 2024-12-18 12:32:47 -07:00
zandercymatics
f19ff3cd66
PR suggestions 2024-12-18 12:25:21 -07:00
zandercymatics
a9923f4cc9
Update portfolio.py 2024-12-18 12:09:01 -07:00
zandercymatics
c3480893da
Readd modelforms 2024-12-18 12:06:40 -07:00
zandercymatics
adfd6be7bb
Fix some merge things 2024-12-18 11:59:33 -07:00
zandercymatics
6965607f61
Update portfolio-member-page.js 2024-12-18 11:55:17 -07:00
zandercymatics
08082fb0aa
cleanup pt 2 2024-12-18 11:51:03 -07:00
zandercymatics
437981ff30
Remove changes to newmember 2024-12-18 11:44:58 -07:00
zandercymatics
b0d1bc26da
revert csv-export 2024-12-18 11:15:13 -07:00
Erin Song
50ed918119
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/2913-domain-request-screenreader 2024-12-16 13:18:19 -08:00
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
Erin Song
fda1bcdf2b
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/2913-domain-request-screenreader 2024-12-13 14:04:37 -08: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