Commit graph

7667 commits

Author SHA1 Message Date
zandercymatics
a92ae0f3d6
Merge pull request #2528 from cisagov/hotgov/bugfix-fix-csv-export-display
BUGFIX: Fix html for "Export as CSV button"
2024-08-01 11:41:37 -06:00
Cameron Dixon
e5ddcfe208
Merge pull request #2344 from cisagov/h-m-f-t-patch-1
Update domain_invitation_description.html to give better direction to analysts
2024-08-01 12:31:32 -04:00
Cameron Dixon
c6943daa21
Update src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html
Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>
2024-08-01 12:21:29 -04:00
zandercymatics
ec88af56c3
Update domains_json.py 2024-08-01 09:59:43 -06:00
zandercymatics
86f040e4b7
Reapply "Merge branch 'main' into za/2348-csv-export-org-member-domain-export"
This reverts commit 8becad8186.
2024-08-01 09:53:59 -06:00
zandercymatics
8becad8186
Revert "Merge branch 'main' into za/2348-csv-export-org-member-domain-export"
This reverts commit 4118bf17f9, reversing
changes made to 7eba6b721d.
2024-08-01 08:58:38 -06:00
asaki222
7e64076fa9
Merge pull request #2525 from cisagov/ag/adding-permissions-to-test-accounts
added uuid and name to fixtures.py
2024-08-01 10:56:26 -04:00
zandercymatics
4118bf17f9
Merge branch 'main' into za/2348-csv-export-org-member-domain-export 2024-08-01 08:53:54 -06:00
asaki222
9faaeb7d91
reformatted file 2024-08-01 10:50:56 -04:00
zandercymatics
2edcabe76f
Readd deleted content 2024-08-01 08:34:56 -06:00
David Kennedy
7f112c1295
test functionality 2024-08-01 09:48:51 -04:00
Rachid Mrad
70d30f9cee
fix unit tests 2024-08-01 08:52:02 -04:00
Rachid Mrad
7b46e39a89
fix unit tests 2024-08-01 08:42:57 -04:00
Rachid Mrad
ca24078f50
fix unit tests 2024-08-01 08:37:21 -04:00
Rachid Mrad
108adce05e
fix migrations 2024-08-01 08:28:36 -04:00
Rachid Mrad
53a419a25e
merge main 2024-08-01 08:23:59 -04:00
Rachid Mrad
f22316ccc2
fix unit tests 2024-08-01 08:14:26 -04:00
David Kennedy
1ccd59a0aa
formatted for readability 2024-07-31 22:46:26 -04:00
David Kennedy
978ea903e7
formatted for code readability 2024-07-31 22:40:35 -04:00
David Kennedy
7860d8c587
updated existing tests 2024-07-31 22:25:59 -04:00
David Kennedy
1e4e87ae98
merge main 2024-07-31 22:11:46 -04:00
David Kennedy
9bc59fdce0
merge main 2024-07-31 21:53:09 -04:00
David Kennedy
fe5af50100
initial implementation 2024-07-31 21:42:11 -04:00
Rachid Mrad
8f84f33756
portfolio invitation model 2024-07-31 20:34:34 -04:00
CocoByte
e0ea11d909
Merge remote-tracking branch 'origin/main' into rh/2406-clipboard 2024-07-31 17:26:48 -06:00
Rachid Mrad
6523fca640
test clean up 2024-07-31 18:16:51 -04:00
CocoByte
4bc19d020c
Fixed compiler, fixed edge case where copy-paste doesn't work in plain text situations 2024-07-31 14:06:38 -06:00
asaki222
723d8ecc80
added uuid 2024-07-31 15:05:46 -04:00
zandercymatics
7eba6b721d
Linting cleanup 2024-07-31 12:20:43 -06:00
zandercymatics
3fafaf2d2a
Update domains_json to reflect the correct data 2024-07-31 12:15:14 -06:00
Rachid Mrad
3fef7664e4
cleanup 2024-07-31 13:59:00 -04:00
zandercymatics
117c7e0c42
Rebase logic 2024-07-31 11:55:50 -06:00
Rachid Mrad
f1d896e6b6
cleanup 2024-07-31 13:22:32 -04:00
zandercymatics
a0bfdbf2b1
Merge branch 'za/bugfix-hide-csv-export-button-on-empty' into za/2348-csv-export-org-member-domain-export 2024-07-31 11:16:32 -06:00
zandercymatics
20f9370ef1
Merge branch 'main' into za/2348-csv-export-org-member-domain-export 2024-07-31 11:16:12 -06:00
zandercymatics
49d81f4c58
add check for if the user doesn't have any domains 2024-07-31 11:15:57 -06:00
zandercymatics
280f7cbc1b
Add logic 2024-07-31 11:02:18 -06:00
CocoByte
d3b88ccb2b
Styling updates 2024-07-31 10:31:07 -06:00
zandercymatics
f3489ae571
Cleanup 2024-07-31 08:43:49 -06:00
CocoByte
f7caee0d11
fixed unit tests 2024-07-30 20:23:45 -06:00
dave-kennedy-ecs
f9606ac43c
Merge pull request #2482 from cisagov/meoward/2459-clean-tables
Issue #2459: updated clean_tables to run in batches of 1000 rows
2024-07-30 22:14:59 -04:00
David Kennedy
98d8e4ec93
updates 2024-07-30 22:10:05 -04:00
CocoByte
9a5b07c79f
Added logic for case when there are NO additional contacts 2024-07-30 19:49:47 -06:00
CocoByte
892c8331b3
Fixed logic for different display options of "other contacts" 2024-07-30 19:41:26 -06:00
CocoByte
7b56562417
Fixed error with javascript file, more styling 2024-07-30 18:45:44 -06:00
Rachid Mrad
6a94da8a5d
cleanup 2024-07-30 20:22:53 -04:00
Rachid Mrad
867ccd097e
remove migration 2024-07-30 20:21:41 -04:00
Rachid Mrad
efad235516
merge main 2024-07-30 20:16:15 -04:00
Rachid Mrad
7f212edda5
revert some of the tweaks 2024-07-30 19:58:39 -04:00
CocoByte
0953e50bb0
styling updates 2024-07-30 17:39:02 -06:00