8073 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	ea5207f017	Revert url (breaking tests)	2024-08-21 14:07:13 -06:00
zandercymatics	1f7e190439	Merge branch 'main' into hotgov/2493-basic-org-view	2024-08-21 14:05:09 -06:00
zandercymatics	2fc8acb614	Update urls.py	2024-08-21 14:02:03 -06:00
zandercymatics	9e04e9f5ba	typo	2024-08-21 13:08:40 -06:00
zandercymatics	035b4206f3	Add test + fix perms	2024-08-21 13:07:52 -06:00
David Kennedy	01f05c7fde	test registrar_middleware for multiple_portfolios	2024-08-21 14:42:36 -04:00
David Kennedy	8667f0b61b	Merge branch 'temp' into za/2586-infra-for-multiple-portfolios	2024-08-21 14:29:02 -04:00
David Kennedy	f4647caded	working on tests	2024-08-21 14:28:23 -04:00
zandercymatics	aa872d6e41	Fix last test and lint	2024-08-21 12:22:03 -06:00
zandercymatics	bfc2693a12	Fix a few more tests	2024-08-21 12:12:50 -06:00
zandercymatics	32ed84a5e1	Fix logic in clean	2024-08-21 11:43:40 -06:00
Matthew Spence	08c42a6e8d	merge main and resolve migration conflicts	2024-08-21 12:28:41 -05:00
Matthew Spence	eac757a6a6	Merge remote-tracking branch 'origin/main' into ms/2451-additional-domain-request-dates	2024-08-21 12:25:59 -05:00
Rachid Mrad	e82326346c	clean up roles logic	2024-08-21 12:43:38 -04:00
Rachid Mrad	eb061be71b	Django admin portfolio members section	2024-08-21 12:25:27 -04:00
zandercymatics	5c07775277	Fix two tests	2024-08-21 10:15:49 -06:00
zandercymatics	cbec3f2ed7	Update mixins.py	2024-08-21 09:43:24 -06:00
zandercymatics	ba2add8bc8	Fix redirect bug and fix permission issue	2024-08-21 09:42:31 -06:00
zandercymatics	729ce4c9f7	Replace inline if with .get ... Not sure why I was doing that	2024-08-21 08:46:47 -06:00
zandercymatics	4f4dac2728	Add better error handling on session["portfolio"] ... This was causing an error on some functions where request can be None, like our csv exports	2024-08-21 08:42:05 -06:00
zandercymatics	381ac49487	lint pt 2	2024-08-20 14:58:51 -06:00
zandercymatics	a362c2ef6c	Linting	2024-08-20 14:53:16 -06:00
zandercymatics	9e1643edf0	Fix (some) test errors	2024-08-20 14:49:04 -06:00
zandercymatics	5c8ad8cd34	Fix incorrect param name for completed domain request	2024-08-20 14:30:04 -06:00
zandercymatics	5f6f39048f	Fix edge cases	2024-08-20 14:17:14 -06:00
David Kennedy	3c89557976	wip	2024-08-20 15:29:28 -04:00
matthewswspence	df9f3dcce5	fix some tests	2024-08-20 13:48:16 -05:00
Erin Song	43097ce69d	Merge pull request #2600 from cisagov/rh/2341-andi ... ISSUE #2341: Enable ANDI on browser	2024-08-20 10:06:45 -07:00
CocoByte	b0b7c5bd0d	Merge remote-tracking branch 'origin/main' into nl/2470-update-action-needed-email	2024-08-19 16:54:56 -06:00
CocoByte	fcf8ea613f	update footer text	2024-08-19 16:54:43 -06:00
CocoByte	5d34abd69d	changed footer text to match updates to design specs	2024-08-19 16:36:28 -06:00
CocoByte	1cab199eba	PR feedback	2024-08-19 16:32:29 -06:00
CuriousX	21ecf77b45	Merge pull request #2610 from cisagov/nl/2518-suborg-domainrequest-display ... Issue #2518: Suborganization shows all related domains/requests [cb]	2024-08-19 16:18:20 -06:00
zandercymatics	432ee9c860	pt. 1 of test refactors	2024-08-19 15:18:54 -06:00
zandercymatics	f587a994f2	cleanup	2024-08-19 12:26:14 -06:00
zandercymatics	733eee6fcc	Update portfolio_invitation.py	2024-08-19 11:25:47 -06:00
zandercymatics	565a9299f4	Update views.py	2024-08-19 11:20:14 -06:00
zandercymatics	289099dd92	Clean logic	2024-08-19 10:47:13 -06:00
zandercymatics	28a7d7bee2	invitation logic pt 2	2024-08-19 10:28:13 -06:00
zandercymatics	cedd7f254a	Fix middleware test	2024-08-19 09:25:42 -06:00
zandercymatics	78a5774af2	Change invitation logic	2024-08-19 09:24:11 -06:00
zandercymatics	0c747bed94	Fix unit tests	2024-08-19 09:04:39 -06:00
zandercymatics	eb5623987a	Merge pull request #2601 from cisagov/za/2580-add-jyoti-to-fixtures ... Ticket #2580: Add jyoti to fixtures	2024-08-19 08:31:08 -06:00
CocoByte	efc7836197	linted	2024-08-16 16:06:37 -06:00
CuriousX	d2c4cf2bfa	Merge pull request #2537 from cisagov/nl/2240-additional-details-completion-bug ... Issue #2240 - Registrar step completion bug [backup]	2024-08-16 16:05:22 -06:00
CocoByte	b83cc5a980	removed commented out code	2024-08-16 15:45:01 -06:00
CocoByte	469a4bda87	Added domains and domain request section to suborgs	2024-08-16 15:44:37 -06:00
zandercymatics	3e024f4ed0	Update user.py	2024-08-16 15:17:42 -06:00
zandercymatics	1090d75f75	Refactor fields using portfolio	2024-08-16 15:05:30 -06:00
zandercymatics	e03e6f7d35	Add permission table	2024-08-16 14:57:51 -06:00