8050 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Kennedy	5da8119f86	adjusted code for correct version of django	2024-08-22 19:02:55 -04:00
David Kennedy	4a104b6ff6	formatted for linter	2024-08-22 17:25:52 -04:00
matthewswspence	62ac4757ec	review changes	2024-08-22 16:25:24 -05:00
David Kennedy	6286ae96be	updated portfolio changeform view in admin	2024-08-22 17:24:33 -04:00
matthewswspence	4026e9be86	minor changes	2024-08-22 15:47:21 -05:00
David Kennedy	e59d4738e3	filtering by portfolios	2024-08-22 16:44:25 -04:00
zandercymatics	7fb186e24b	Display logic in admin	2024-08-22 14:11:28 -06:00
matthewswspence	48901a716d	rewrite script and extend terminal helper for more context	2024-08-22 14:30:14 -05:00
zandercymatics	056a3ecf36	Add to fixtures and add whitelist logic	2024-08-22 13:26:32 -06:00
zandercymatics	42dec38b22	skeleton pt 2	2024-08-22 12:12:38 -06:00
zandercymatics	fbfab28f3b	skeleton	2024-08-22 11:17:36 -06:00
Matthew Spence	1a4268dedd	add new script to update first ready values	2024-08-22 09:46:07 -05:00
zandercymatics	bef49a85c1	Cleanup	2024-08-22 08:33:03 -06:00
David Kennedy	76fef5303b	removed pseudo apostrophe	2024-08-21 18:41:14 -04:00
CocoByte	3a27e1f887	Merge remote-tracking branch 'origin/main' into nl/2470-update-action-needed-email	2024-08-21 16:13:07 -06:00
CocoByte	ee73893a20	fix e-mail sent logic, fix text size in nested text area input	2024-08-21 16:12:34 -06:00
David Kennedy	833b698bf2	adding request to a few flag_is_active instances	2024-08-21 17:52:02 -04:00
David Kennedy	fbb4ee927b	Merge branch 'za/2586-infra-for-multiple-portfolios' of https://github.com/cisagov/manage.get.gov into za/2586-infra-for-multiple-portfolios	2024-08-21 17:18:09 -04:00
David Kennedy	ff86edbc35	more updates to test and for linting	2024-08-21 17:18:00 -04:00
zandercymatics	acd024fee4	Merge branch 'za/2586-infra-for-multiple-portfolios' of github.com:cisagov/manage.get.gov into za/2586-infra-for-multiple-portfolios	2024-08-21 15:12:52 -06:00
zandercymatics	e866bcb2fb	Fix test (still needs refinement)	2024-08-21 15:12:37 -06:00
David Kennedy	75ff4a591c	Merge branch 'za/2586-infra-for-multiple-portfolios' of https://github.com/cisagov/manage.get.gov into za/2586-infra-for-multiple-portfolios	2024-08-21 17:08:40 -04:00
David Kennedy	0858a9663f	added more tests	2024-08-21 17:08:09 -04:00
zandercymatics	4dadb715e8	Fix merge conflict (pt 1)	2024-08-21 15:03:28 -06:00
zandercymatics	bbcf406df6	Merge branch 'main' into za/2586-infra-for-multiple-portfolios	2024-08-21 14:58:52 -06:00
zandercymatics	8c3cfa42a0	Merge branch 'main' into za/2586-infra-for-multiple-portfolios	2024-08-21 14:40:12 -06:00
zandercymatics	ecafaa58c9	Merge pull request #2549 from cisagov/hotgov/2493-basic-org-view ... Ticket #2493: Org member view	2024-08-21 14:35:43 -06:00
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