8752 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
David Kennedy	2738c187ed	Merge branch 'dk/2789-member-page' of https://github.com/cisagov/manage.get.gov into dk/2789-member-page	2024-10-08 14:44:26 -04:00
David Kennedy	69a98a2f7d	fixed tests and view on domains	2024-10-08 14:44:20 -04:00
zandercymatics	ade6733b0e	Remove bad import	2024-10-08 12:35:52 -06:00
Rachid Mrad	de9736ec95	acc cancel invitation button on mobile view	2024-10-08 13:49:30 -04:00
Rachid Mrad	dc76782a43	remove checks on members nav link	2024-10-08 13:36:05 -04:00
Rachid Mrad	99c112afd0	Update src/registrar/admin.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-10-08 12:57:04 -04:00
Rachid Mrad	b1dd91f773	add check for original_obj.requested_domain is not None	2024-10-08 12:56:46 -04:00
Rachid Mrad	79b904e3be	Update src/registrar/tests/test_admin_request.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-10-08 12:54:50 -04:00
Rachid Mrad	c0fcfd7c44	put back accidentally deleted tests	2024-10-08 12:54:33 -04:00
David Kennedy	d9a79cabad	test models	2024-10-08 12:52:14 -04:00
asaki222	22d0833be2	added back things i changed by accident	2024-10-07 19:17:29 -04:00
asaki222	1aaefde0c4	moved domain name into separate span	2024-10-07 19:15:59 -04:00
asaki222	aa5690e894	added class name	2024-10-07 18:42:35 -04:00
asaki222	39bba36494	edited css for modal	2024-10-07 18:25:25 -04:00
Rachid Mrad	42a25b0d68	move the logic from templates into the views when testing for permissions	2024-10-07 18:16:13 -04:00
Rebecca H.	286cf8e417	Merge pull request #2878 from cisagov/rh/2592-domain-request-export ... #2592: Domain Request CSV Export - [RH]	2024-10-07 14:24:23 -07:00
Rebecca Hsieh	9c4638492b	Remove print statements	2024-10-07 14:19:25 -07:00
Rebecca Hsieh	b331011499	Print statements	2024-10-07 14:17:45 -07:00
David Kennedy	91355dc7a4	Assigned domains for portfolio invitations	2024-10-07 16:27:11 -04:00
David Kennedy	5c4705d417	Merge branch 'dk/2789-member-page' of https://github.com/cisagov/manage.get.gov into dk/2789-member-page	2024-10-07 15:20:56 -04:00
David Kennedy	15db31b3dc	assigned domains	2024-10-07 15:16:40 -04:00
Rachid Mrad	390324747e	merge	2024-10-07 15:08:25 -04:00
Rachid Mrad	cf39c7cc68	3 dot menu	2024-10-07 15:07:32 -04:00
asaki222	70caf535c2	added line	2024-10-07 15:04:00 -04:00
David Kennedy	58002de5e0	updated model	2024-10-07 13:18:13 -04:00
David Kennedy	57c89497b2	formatting of last active date	2024-10-07 12:52:42 -04:00
asaki222	da3d7d1c54	added new line because wrap is breaking up the word for	2024-10-07 12:30:01 -04:00