Commit graph

8913 commits

Author SHA1 Message Date
Rachid Mrad
73e3ced96a
merge main 2024-09-06 13:51:18 -04:00
Rachid Mrad
1e9ae7befc
cleanup 2024-09-06 13:46:52 -04:00
Rachid Mrad
49e656082a
merge 2024-09-06 12:55:01 -04:00
Rachid Mrad
cbdf763637
CSS done 2024-09-06 12:54:36 -04:00
zandercymatics
bb7a521bf4
Merge branch 'main' into rjm/2351-org-requests-page 2024-09-06 10:17:20 -06:00
zandercymatics
44e363da04
Update create_federal_portfolio.py 2024-09-06 10:14:06 -06:00
zandercymatics
23d471f11c
Add --both 2024-09-06 10:08:50 -06:00
zandercymatics
de76577384
Merge branch 'main' into ag/2616-populate-suborg-and-portfolio-script 2024-09-06 09:29:09 -06:00
Matthew Spence
a2291d75ed
doc fixes 2024-09-06 10:27:52 -05:00
zandercymatics
ea7544059e
Comment out breadcrumb bar
Not needed in this PR
2024-09-06 08:36:23 -06:00
David Kennedy
008b9d57a5
cleanup 2024-09-06 08:58:28 -04:00
David Kennedy
467536600e
limit domains_json view to domains based on user's portfolio permissions 2024-09-06 08:56:27 -04:00
CocoByte
0b01d608b3
Merge remote-tracking branch 'origin/main' into nl/2669-max-width-adjustment-for-wide-screens 2024-09-05 22:32:36 -06:00
CocoByte
87bc704699
corrected location of file 2024-09-05 22:32:26 -06:00
CocoByte
7a2963d712
Added simple frontend test for widescreen mode 2024-09-05 22:18:43 -06:00
CocoByte
40d6423bb6
linted 2024-09-05 21:46:38 -06:00
CuriousX
ae143e78cd
Merge pull request #2706 from cisagov/nl/2696-suborg-sort-button-fix
Issue #2696: Suborganization sort button fix
2024-09-05 21:40:27 -06:00
CocoByte
f158b71b39
Resolved merge conflicts 2024-09-05 21:33:00 -06:00
CocoByte
15fc5bf0e9
merged 2024-09-05 21:30:56 -06:00
CocoByte
ecc1038c34
Added widescreen detection and scss adjustments for Domains and Domain Request page 2024-09-05 21:27:41 -06:00
David Kennedy
6a08c1e97a
migrations file 2024-09-05 19:41:22 -04:00
David Kennedy
b4827ff5a3
merged pulled updates 2024-09-05 19:25:50 -04:00
David Kennedy
faf57902f0
filter requests based on permissions, updated actions based on permissions 2024-09-05 19:22:31 -04:00
Erin Song
78476a98c1
Whitelist emails sent in test save models 2024-09-05 15:51:30 -07:00
Erin Song
f7fed00e8a
Correct migration order 2024-09-05 14:48:01 -07:00
Erin Song
07d8017e99
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/2162-delete-submitter-v2 2024-09-05 14:46:22 -07:00
Erin Song
2acef3f3d9
Convert submitter to null on delete 2024-09-05 14:37:39 -07:00
zandercymatics
944a3f4a7e
lint 2024-09-05 15:24:38 -06:00
zandercymatics
e0bc28f2c7
Fix tests 2024-09-05 15:17:53 -06:00
zandercymatics
f7df9a3566
Merge branch 'main' into rjm/2651-action-needed-email 2024-09-05 13:42:44 -06:00
Rachid Mrad
b4dd786c02
pull 2024-09-05 15:36:38 -04:00
Rachid Mrad
9ea0f312fc
CSS tweaks 2024-09-05 15:36:08 -04:00
zandercymatics
3c3fd26b93
Finishing or canceling a request redirects to domain request view 2024-09-05 13:16:38 -06:00
Rachid Mrad
2939c89e0d
pull 2024-09-05 15:02:12 -04:00
Rachid Mrad
d802b9a614
Add created by column 2024-09-05 15:01:37 -04:00
zandercymatics
9bd67cfdbe
fix bug with registrar and basic redirect link stuff 2024-09-05 11:38:16 -06:00
Rachid Mrad
ec7202b47c
merge main: 2024-09-05 12:25:08 -04:00
Rachid Mrad
bc2ae126f1
pull 2024-09-05 12:23:50 -04:00
Rachid Mrad
8f8d9a8692
last row accordion placement 2024-09-05 12:23:09 -04:00
Rachid Mrad
cebbd42ce6
Merge pull request #2655 from cisagov/hotgov/2544-design-review
Issue #2544: Design review on view and manage domains, org feature - [HOTGOV]
2024-09-05 12:21:54 -04:00
David Kennedy
49110461ef
lint 2024-09-05 12:10:49 -04:00
Rachid Mrad
a6b9d79fad
cleanup comments 2024-09-05 12:07:57 -04:00
Rachid Mrad
33191ae919
Merge pull request #2622 from cisagov/rjm/2521-portfolio-members-admin
Issue #2521: Django admin portfolio members section - [RJM]
2024-09-05 12:03:10 -04:00
David Kennedy
ba20e740b8
refactored domain_requests_json 2024-09-05 11:51:54 -04:00
zandercymatics
9d4ab22dc4
fix unit test 2024-09-05 08:53:37 -06:00
zandercymatics
47e8934cde
Merge branch 'main' into za/2671-show-portfolios-on-user-table 2024-09-05 08:29:44 -06:00
Rachid Mrad
be8a618791
wip 2024-09-05 00:13:18 -04:00
asaki222
68b8a6086b
formated changes 2024-09-04 19:53:44 -04:00
asaki222
ef30e06b89
added back the sucess message under else 2024-09-04 18:32:07 -04:00
asaki222
0d00bd467d
removed spacing 2024-09-04 18:27:57 -04:00