9206 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
CocoByte	ddc98b6371	Remaining ANDI updates	2024-10-09 16:55:48 -06:00
Erin Song	aec1a4f0d4	Reverse email send check	2024-10-09 15:15:45 -07: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
CocoByte	f1be3fafeb	linted + comments	2024-10-09 14:23:03 -06:00
CocoByte	f0b0e9d246	Manually correct faulty unit test merge	2024-10-09 14:12:38 -06:00
CocoByte	0103cbbded	Merge remote-tracking branch 'origin/nl/2859-multiple-portfolio-flags-bug' into nl/2859-multiple-portfolio-flags-bug	2024-10-09 14:09:52 -06:00
CocoByte	75c610476c	Reapply "resolved merge conflict" ... This reverts commit d1f3f0efb1.	2024-10-09 14:09:39 -06:00
CocoByte	d1f3f0efb1	Revert "resolved merge conflict" ... This reverts commit 85be976ee4, reversing changes made to bd018e14ab.	2024-10-09 14:08:05 -06:00
Alysia Broddrick	7520aaa4b4	Merge remote-tracking branch 'origin' into add-rotate-login-script	2024-10-09 13:04:39 -07:00
zandercymatics	2da39e9a98	Fix minor bug	2024-10-09 12:38:51 -06:00
asaki222	81b959e778	updated test	2024-10-09 12:37:10 -04: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
CocoByte	8d13ea2f9f	Initial ANDI screenreader fixes	2024-10-08 17:48:25 -06:00
Erin Song	889c0a25db	Secure portfolio check on requestor org	2024-10-08 16:10:27 -07:00
Erin Song	6a01e5646d	Debug email bug	2024-10-08 15:39:38 -07:00
Erin Song	2f2c4e1951	Simplify try catch	2024-10-08 15:27:36 -07:00
Erin Song	9425d4c35f	Isolate user domain role create	2024-10-08 15:26:16 -07:00
CocoByte	85be976ee4	resolved merge conflict	2024-10-08 16:01:19 -06:00
CocoByte	bd018e14ab	cleanup	2024-10-08 15:53:31 -06:00
CocoByte	23e99c054d	added unit test	2024-10-08 15:53:04 -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
Erin Song	e396534b38	Fix indent	2024-10-08 12:15:15 -07:00
Erin Song	17b5f36fbc	Fix indent	2024-10-08 12:14:54 -07:00
Erin Song	467b7a90f5	Readd try block	2024-10-08 12:14:15 -07: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
zandercymatics	081c762246	Revert "Remove old migrations (merging)" ... This reverts commit e3d2dc0cb8.	2024-10-08 12:52:17 -06:00
zandercymatics	c76e27f145	Merge branch 'main' into hotgov/2355-rejection-reason-emails	2024-10-08 12:50:53 -06:00
zandercymatics	e3d2dc0cb8	Remove old migrations (merging)	2024-10-08 12:50:37 -06:00
David Kennedy	08a273c296	linted	2024-10-08 14:48:11 -04:00