8704 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Kennedy	a01d1fa378	add roles, additional_permissions, domain_urls and domain_names to portfolio_members_json response	2024-10-16 06:52:41 -04:00
David Kennedy	445af256b6	variable name cleanup	2024-10-15 08:09:24 -04:00
David Kennedy	857138c4f9	properly handle None condition for roles	2024-10-12 10:53:39 -04:00
David Kennedy	71b8bf38a1	properly handle None condition for roles	2024-10-12 10:40:44 -04:00
David Kennedy	7bc0dbf9c2	fixed a bug	2024-10-12 10:19:19 -04:00
David Kennedy	d469041a8e	formatted code for readability	2024-10-12 09:47:18 -04:00
David Kennedy	1cd6fdda15	refactored members_json, fixed unfiltered_total, and member sorting	2024-10-12 09:45:19 -04:00
Rachid Mrad	0bd48030e5	fix active class on member link	2024-10-11 18:08:15 -04:00
Rachid Mrad	af83636e02	refactor portfolio_members_json and move back the computation to the ORM	2024-10-11 17:47:03 -04:00
Rachid Mrad	b103a307e6	lint	2024-10-11 16:17:24 -04:00
Rachid Mrad	1aaafb205a	fix search	2024-10-11 16:15:38 -04:00
Rachid Mrad	b683bb1d45	fix first and last name join and lint	2024-10-11 16:09:58 -04:00
Rachid Mrad	7cd2c6fef3	merge main and fix migrations	2024-10-11 15:58:27 -04:00
David Kennedy	78a0852223	add member button hidden when user does not have permission	2024-10-11 11:23:42 -04:00
David Kennedy	5c305c8557	safer handling of None values in json view	2024-10-11 11:15:43 -04:00
David Kennedy	a31c5ebe31	fixed improper handling of booleans in template	2024-10-11 11:05:37 -04:00
David Kennedy	20eb1e593b	renaming of mgmt template to management	2024-10-11 10:58:13 -04:00
David Kennedy	a466b991ff	cleanup of imports	2024-10-11 10:50:24 -04:00
David Kennedy	ce5a11548e	updated javascript for code readability	2024-10-11 10:45:45 -04:00
zandercymatics	a1d9904176	Merge pull request #2869 from cisagov/hotgov/2355-rejection-reason-emails ... #2355: Custom rejection reason emails - [BACKUP] - MIGRATION	2024-10-10 14:51:21 -06:00
zandercymatics	8b705548c6	Merge branch 'main' into hotgov/2355-rejection-reason-emails	2024-10-10 14:00:40 -06:00
zandercymatics	3fb9ab576b	lint	2024-10-10 10:01:03 -06:00
zandercymatics	3e54bb1e59	simplify javascript	2024-10-10 09:52:56 -06:00
zandercymatics	dbfc54837a	Fix test + some minor cleanup stuff	2024-10-10 09:06:10 -06:00
zandercymatics	3db0388071	Merge pull request #2895 from cisagov/za/2760-portfolio-domain-request-entry-point-2 ... #2760: Portfolio domain request entry point - [ZA]	2024-10-09 15:13:16 -06:00
zandercymatics	2da39e9a98	Fix minor bug	2024-10-09 12:38:51 -06:00
zandercymatics	d90810c844	Revert "dummy migration ( will revert commit )" ... This reverts commit ffb8311fd0.	2024-10-09 09:26:47 -06:00
zandercymatics	ffb8311fd0	dummy migration ( will revert commit )	2024-10-09 09:21:29 -06:00
zandercymatics	ec1df251b8	remove bad test + lint	2024-10-09 09:04:37 -06:00
zandercymatics	bd603f69fb	Remove space	2024-10-09 08:41:08 -06:00
zandercymatics	3ba4293334	Update test_models.py	2024-10-09 08:37:01 -06:00
zandercymatics	7c69205deb	Update test_models.py	2024-10-09 08:34:40 -06:00
zandercymatics	fc8090dc15	Merge branch 'main' into hotgov/2355-rejection-reason-emails	2024-10-09 08:33:26 -06:00
zandercymatics	cd7b45a7f4	Merge branch 'main' into za/2760-portfolio-domain-request-entry-point-2	2024-10-09 08:29:51 -06:00
zandercymatics	d907463e85	remove unneeded print	2024-10-09 08:28:38 -06:00
Rachid Mrad	f299dc822c	Merge pull request #2879 from cisagov/rjm/1846-copy-email-btn ... #2846: Fix bugs with the copy email button UI plus code cleanup - [RJM]	2024-10-08 16:45:17 -04:00
Rachid Mrad	50abaab52d	cleanup	2024-10-08 16:35:37 -04:00
Rachid Mrad	81df3974ff	merge	2024-10-08 16:08:06 -04:00
Rachid Mrad	935cafb88a	Merge pull request #2888 from cisagov/rjm/1263-approved-domain-error ... #1263 Request error: Already approved domain - [RJM]	2024-10-08 16:05:32 -04:00
David Kennedy	2f36be268e	another incremental fix to zap.conf	2024-10-08 16:03:54 -04:00
David Kennedy	3efd907764	incremental fix for spacing in zap.conf	2024-10-08 16:02:55 -04:00
David Kennedy	40c061af98	fixed tabs in zap	2024-10-08 15:37:54 -04:00
David Kennedy	b1ebfec2fb	zap fix2	2024-10-08 15:35:37 -04:00
David Kennedy	6c1c0dd735	zap fix1	2024-10-08 15:35:16 -04:00
David Kennedy	18656a8943	owasp fix	2024-10-08 15:30:18 -04:00
David Kennedy	56d94227e2	fixed broken test	2024-10-08 15:26:09 -04:00
David Kennedy	0ee78e9102	comment	2024-10-08 15:09:06 -04:00
David Kennedy	acd09d3122	fixed migrations	2024-10-08 15:05:45 -04:00
David Kennedy	0dbaf1ea97	Merge branch 'main' into dk/2789-member-page	2024-10-08 15:04:45 -04:00
zandercymatics	a4ffc75efa	Fix migrations	2024-10-08 12:53:02 -06:00