Commit graph

6524 commits

Author SHA1 Message Date
zandercymatics
fbabd2029c
Merge branch 'main' into ag/2616-populate-suborg-and-portfolio-script 2024-09-10 14:25:59 -06:00
dave-kennedy-ecs
67a81b53ea
Merge pull request #2718 from cisagov/backup/2717-domain-table-filter
Issue #2717: Domain table filtering for portfolio user with VIEW_MANAGED_DOMAINS
2024-09-10 11:59:20 -04:00
matthewswspence
872f943220
unused import 2024-09-09 10:10:04 -05:00
matthewswspence
ffaf3b5a37
fix linter errors 2024-09-09 10:00:34 -05:00
zandercymatics
d1b4054f0f
Merge branch 'main' into dk/2667-waffle-flags-org 2024-09-09 08:23:08 -06:00
Matt-Spence
1cc2840ff7
Merge pull request #2656 from cisagov/ms/2560-update-first-ready-values
Issue #2560 update first ready values
2024-09-06 15:30:16 -05:00
Rachid Mrad
db593fcb6e
merge cleanup 2024-09-06 13:57:28 -04:00
Rachid Mrad
73e3ced96a
merge main 2024-09-06 13:51:18 -04: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
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
f158b71b39
Resolved merge conflicts 2024-09-05 21:33:00 -06: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
zandercymatics
e5f2b83f6a
Fix failing tests 2024-09-04 15:34:54 -06:00
CocoByte
ecc5e86320
(missed a file in last push) 2024-09-04 14:23:34 -06:00
CocoByte
684cf181c9
fixed sort button issue (thank you Rachid and Zander for the peer programming) 2024-09-04 13:52:30 -06:00
Rachid Mrad
d802b51dc4
unit tests and lint 2024-09-04 14:38:58 -04:00
zandercymatics
dbe438b6dc
Update context_processors.py 2024-09-04 11:52:02 -06:00
zandercymatics
39e6cb8933
Add members 2024-09-04 11:50:44 -06:00
Rachid Mrad
cba2b27d79
escape dynamic values 2024-09-04 13:44:45 -04:00
David Kennedy
dd1b923404
wip 2024-09-04 13:41:26 -04:00
Rachid Mrad
dea71ce366
merge main 2024-09-04 13:31:44 -04:00
Rebecca H.
cc7f588dad
Merge pull request #2690 from cisagov/rh/2660-portfolio-beautify
ISSUE 2660: Add Sticky Bar to Portfolios + Remove CISA Region
2024-09-04 09:11:03 -07:00
Alysia Broddrick
2593c4101d
Merge pull request #2694 from cisagov/staging-action-needed-email-hotfix
Hotfix JS for edit email button not found
2024-09-03 15:20:45 -07:00
zandercymatics
ff00d564de
Update allowed_email_description.html 2024-09-03 14:01:30 -06:00
zandercymatics
1792e3c0d8
fix bug 2024-09-03 13:39:48 -06:00
Rachid Mrad
79fbc5c540
cleanup 2024-08-30 17:46:05 -04:00
Rachid Mrad
e20bfa5567
lint 2024-08-30 17:44:09 -04:00
Rachid Mrad
ca1c9bbb04
fix model tests? 2024-08-30 17:35:57 -04:00
Rachid Mrad
ef2adaaf28
No additional members found 2024-08-30 17:25:56 -04:00
Rachid Mrad
2af57c8aa8
Revise for multiple portfolios 2024-08-30 17:21:04 -04:00
Rachid Mrad
fc2f4f08cc
Merge main 2024-08-30 14:51:23 -04:00
Rebecca Hsieh
2eef22f895
Update function name 2024-08-30 11:18:45 -07:00
Rachid Mrad
29a6a53fbe
Remove redundant code 2024-08-30 12:32:09 -04:00
Rachid Mrad
e59cb9ae7d
Hotfix JS for edit email button not found 2024-08-30 12:05:56 -04:00
Rachid Mrad
c4dc3802a8
cleanup 2024-08-30 11:56:24 -04:00
zandercymatics
8732af18d9
Update create_federal_portfolio.py 2024-08-30 09:55:29 -06:00
Rachid Mrad
e1e812c5c7
Fix portfolio transfer 2024-08-30 11:51:24 -04:00
zandercymatics
02bc0cba1a
Add suborg info to domains and requests 2024-08-30 09:49:43 -06:00
zandercymatics
db16ba284b
Update create_federal_portfolio.py 2024-08-30 09:35:45 -06:00
zandercymatics
47b7ee45cc
lint 2024-08-30 09:31:55 -06:00
Rachid Mrad
6a196665dd
merge main 2024-08-30 11:11:54 -04:00
Rachid Mrad
7d2c7a593e
cleanup 2024-08-30 10:58:38 -04:00
zandercymatics
b3b415b563
Remove logic for location information 2024-08-30 08:40:04 -06:00
Rachid Mrad
f16ceccea7
cleanup 2024-08-30 10:33:52 -04:00
Rachid Mrad
973fa0c30a
tweak icon sizes 2024-08-30 10:33:24 -04:00