Commit graph

8738 commits

Author SHA1 Message Date
David Kennedy
84f6445405
merge of main 2025-01-02 19:54:51 -05:00
David Kennedy
c70a16dc6a
fixed tests 2025-01-02 19:48:45 -05:00
Rachid Mrad
81c39c9756
Merge branch 'main' into rb/3158-request-table-ui-fixes 2025-01-02 19:31:19 -05:00
CocoByte
ce5e6b7d7c
Refactored margin on portfolio_ pages so that only single-page layouts have left margin 2025-01-02 17:17:43 -07:00
David Kennedy
c5325a6c56
updated logic to account for domain portfolio assignment 2025-01-02 18:55:05 -05:00
CuriousX
06ee2c40cb
Merge branch 'main' into nl/3011-fix-request-growth-report-data 2025-01-02 16:49:27 -07:00
CocoByte
23eb3ebe96
fixed grid gap 2025-01-02 15:31:18 -07:00
David Kennedy
0c07e931d3
more cleanup in admin 2025-01-02 16:59:52 -05:00
David Kennedy
b39c143b9d
simplified logic on check for existing permission in admin 2025-01-02 16:56:54 -05:00
CocoByte
693720e720
Merge remote-tracking branch 'origin/main' into nl/3074-responsive-layouts-widescreen 2025-01-02 14:34:14 -07:00
CocoByte
16f44584b5
UPDATE TO AC -- add left margin for all single-page views 2025-01-02 14:34:00 -07:00
Erin Song
8f0fa1fcd8
Update python dependencies 2025-01-02 12:37:44 -08:00
Erin Song
54e5b7f20c
Add whitespace to prompt security check workflow 2025-01-02 12:34:17 -08:00
zandercymatics
419179f69d
Remove junk 2025-01-02 12:05:03 -07:00
zandercymatics
3b7746a409
Update package-lock.json 2025-01-02 11:51:42 -07:00
zandercymatics
ef8d8f17bf
Add unit test for requesting entity page 2025-01-02 11:51:05 -07:00
zandercymatics
964bb7980b
Merge branch 'main' into za/3025-add-new-suborgs 2025-01-02 10:57:22 -07:00
zandercymatics
610d00b7a0
Add unit tests 2025-01-02 10:55:06 -07:00
Rachid Mrad
8ab6c76c61
merge main 2025-01-02 12:53:52 -05:00
David Kennedy
a987c5dbcf
Merge branch 'main' into ag/3255-domain-reports-take-three 2025-01-02 12:47:14 -05:00
Rachid Mrad
c675ca5884
make surew we only split the domaininfo on invited items 2025-01-02 12:22:07 -05:00
David Kennedy
0eeee88f1c
hide 'other' for portfolios without suborganizations 2025-01-02 11:40:17 -05:00
zandercymatics
b7b9f96f7a
Merge branch 'main' into za/3025-add-new-suborgs 2025-01-02 09:35:23 -07:00
zandercymatics
c59cb24f51
Cleanup 2025-01-02 09:34:38 -07:00
zandercymatics
6f6e2dbc8b
Add clear button 2025-01-02 09:27:42 -07:00
CocoByte
4faf3df646
delete duplicate (unused) file 2024-12-31 16:46:06 -07:00
CocoByte
284657cf74
cherry-pick old PR changes (before revert) 2024-12-31 16:43:41 -07:00
CuriousX
b4cfb746dc
Revert "#3074 - Change (margin/padding) responsive layouts - [AB]" 2024-12-31 15:12:18 -07:00
CuriousX
f77b583750
Merge branch 'main' into za/3025-add-new-suborgs 2024-12-31 15:02:55 -07:00
Matthew Spence
6119b39a59
fix comment 2024-12-31 15:26:30 -06:00
matthewswspence
c657b9e666
Merge remote-tracking branch 'origin/main' into ms/1768-status-change-notifications 2024-12-31 14:48:40 -06:00
matthewswspence
465e41abc5
fix spacing causing admin bug 2024-12-31 14:30:28 -06:00
Rachid Mrad
4442848a1d
fix error string interpolation 2024-12-31 15:11:15 -05:00
Rachid Mrad
feadf4391a
Add role when adding domains to existing user 2024-12-31 14:51:17 -05:00
Rachid Mrad
0597eac175
simplify left and right to x padding 2024-12-31 13:46:36 -05:00
Rachid Mrad
540b355cac
remove widescreen context processor 2024-12-31 13:39:30 -05:00
Rachid Mrad
8d74dc2844
merge upstream 2024-12-31 13:16:49 -05:00
Rachid Mrad
6b13a8f93f
footer and header adjustemnts 2024-12-31 13:16:14 -05:00
CuriousX
cfc7618c59
Merge branch 'main' into nl/3074-responsive-layouts-widescreen 2024-12-31 11:02:44 -07:00
Rachid Mrad
cf9cd80def
solidify members invited json test with multiple domain invites 2024-12-31 12:21:48 -05:00
matthewswspence
7fd5bacb03
fix broken test 2024-12-31 11:11:24 -06:00
Rachid Mrad
e15c57f3b3
lint and tests 2024-12-31 12:01:35 -05:00
David Kennedy
d9bdc999e4
Merge branch 'main' into dk/3165-sort-bundle' 2024-12-31 11:57:11 -05:00
Rachid Mrad
e3ff4f063d
merge main 2024-12-31 11:51:45 -05:00
David Kennedy
5b049c9d89
Merge branch 'main' into ag/3149-domain-request-compliance-bundle 2024-12-31 10:25:23 -05:00
David Kennedy
3474b35b4f
adding comments, removing logs 2024-12-31 10:24:39 -05:00
David Kennedy
2007daadbb
performed some cleanup 2024-12-31 08:16:28 -05:00
David Kennedy
b86d8bcdc0
Merge branch 'main' into bob/3019-portfolio-invitation-email 2024-12-31 07:47:44 -05:00
David Kennedy
35ecffcbac
fixed mapping of election org types 2024-12-31 07:32:19 -05:00
Rachid Mrad
99a60c09e7
revise error msg and log errors 2024-12-30 21:38:35 -05:00