7327 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	74927fd1f7	Fix logic after pulling from latest	2024-07-26 11:04:57 -06:00
zandercymatics	1053efc68c	Merge branch 'main' into gd/2354-handle-portfolio-edit-mode	2024-07-26 10:31:18 -06:00
Rebecca H.	cc043b5c91	Merge pull request #2477 from cisagov/rh/1261-hide-urbanization ... ISSUE #1261: Hide urbanization field if non-PR	2024-07-26 08:07:32 -07:00
zandercymatics	8155a47db8	Add period for pushing	2024-07-25 15:22:12 -06:00
CuriousX	4725b6f993	Merge pull request #2449 from cisagov/nl/2359-portfolio-inline-domaingroups-and-suborgs ... Issue #2359: Manage Domain Groups and Suborgs in Portfolio admin [litterbox]	2024-07-25 10:04:59 -06:00
zandercymatics	5f646ce269	Update test_views_domain.py	2024-07-25 09:59:32 -06:00
zandercymatics	c4d8c1a38d	Cleanup	2024-07-25 09:44:10 -06:00
zandercymatics	92609f0486	Test	2024-07-25 08:44:45 -06:00
CocoByte	5fd9c02c2e	merged (and resolved conflict)	2024-07-24 14:20:06 -06:00
CuriousX	e8d93bcb8c	Merge pull request #2445 from cisagov/nl/2426-federal-agency-read-only-bug ... Issue #2426 - fixes federal agency read only bug [rb]	2024-07-24 11:31:18 -06:00
zandercymatics	1a0bd062d4	cleanup	2024-07-24 08:43:04 -06:00
zandercymatics	59b8962eee	Cleanup content ... Move to another PR	2024-07-24 08:32:55 -06:00
dave-kennedy-ecs	af45eb508d	Merge pull request #2481 from cisagov/bob/1762-joined-messages-bug ... Issue #1762: Clear warning messages on Contact save	2024-07-24 08:35:58 -04:00
dave-kennedy-ecs	20f075a4cf	Merge pull request #2474 from cisagov/rjm/2366-portfolio-permissions ... Issue #2366: Infra for portfolio permissions	2024-07-24 08:09:14 -04:00
David Kennedy	5edb329bcd	cleanup	2024-07-24 08:04:18 -04:00
CocoByte	b7622a00b9	linted	2024-07-23 21:18:13 -06:00
CocoByte	cfd02700e1	quick fix	2024-07-23 20:35:45 -06:00
zandercymatics	5879afa94b	Cleanup	2024-07-23 15:04:22 -06:00
David Kennedy	d84e5d9a39	fixed tests and linted	2024-07-23 16:06:25 -04:00
zandercymatics	73da16ec3a	Update get-gov.js	2024-07-23 13:51:38 -06:00
zandercymatics	a5a061335e	Add readonly mode	2024-07-23 13:50:50 -06:00
zandercymatics	7f36e6270c	Required fields	2024-07-23 11:29:49 -06:00
Rachid Mrad	0c8307c07e	hide portfolio fields for analysts if no waffle flag	2024-07-23 13:24:13 -04:00
zandercymatics	113421e0b8	Merge branch 'main' into za/2354-handle-portfolio-edit-mode	2024-07-23 10:30:33 -06:00
Rachid Mrad	661d2d7a22	make portfolio a combo box on user edit model	2024-07-23 12:07:53 -04:00
David Kennedy	c17e4e4eaa	change to foreign key definition in portfolio	2024-07-23 11:43:49 -04:00
David Kennedy	01a6257ef4	code commmenting	2024-07-23 11:21:45 -04:00
David Kennedy	d4d066bcd6	addded comment	2024-07-23 11:10:31 -04:00
David Kennedy	ed50709fe3	small change to permission	2024-07-23 10:44:11 -04:00
David Kennedy	f96d9bcf3c	a few changes post merge	2024-07-23 09:29:44 -04:00
zandercymatics	65758e4fc9	Add to overview page	2024-07-22 14:51:19 -06:00
Rebecca Hsieh	a88e0892d1	Remove changes I did on yml	2024-07-22 13:49:49 -07:00
Rebecca Hsieh	517d318507	Remove newline	2024-07-22 13:45:13 -07:00
Rebecca Hsieh	21f0cddce9	Fix added changes on yml file	2024-07-22 13:44:39 -07:00
Rebecca Hsieh	124a030477	Remove comments and fix spacing	2024-07-22 13:12:40 -07:00
Rachid Mrad	dea3efc9c7	lint	2024-07-22 15:54:02 -04:00
Rachid Mrad	58db599d60	resolve merge issues	2024-07-22 15:48:53 -04:00
Rachid Mrad	faddfcec50	merge main	2024-07-22 15:39:46 -04:00
Rachid Mrad	5ed4581e21	revisions	2024-07-22 15:20:54 -04:00
zandercymatics	76713e85cc	Update get-gov.js	2024-07-22 13:13:45 -06:00
zandercymatics	682a2c423c	Other AC	2024-07-22 13:03:02 -06:00
Matt-Spence	673aad74c1	Merge pull request #2485 from cisagov/ms/clean-up-workflow ... Remove duplicate sandbox option	2024-07-22 13:37:11 -05:00
Matthew Spence	634dbd3996	Remove duplicate sandbox option	2024-07-22 13:34:50 -05:00
Matt-Spence	b73658958d	Merge pull request #2483 from cisagov/ms/add-ms-to-workflows ... Add ms sandbox to remaining workflows	2024-07-22 12:18:35 -05:00
Matthew Spence	495d7c7325	Add ms sandbox to remaining workflows	2024-07-22 11:52:46 -05:00
zandercymatics	4e59f0d866	Refactor to use include - for the most part	2024-07-22 10:11:31 -06:00
Matt-Spence	7e9492bd12	Merge pull request #2461 from cisagov/ms/update-dev-onboarding-template ... Update developer onboarding to include instructions for signing commits with ssh	2024-07-22 10:06:39 -06:00
Rachid Mrad	0c8f0b4598	Merge pull request #2431 from cisagov/rjm/2349-portfolio-ui ... Issue #2349: Portfolio templates - [RJM]	2024-07-22 12:05:32 -04:00
zandercymatics	2c9916b214	Basic view	2024-07-22 09:57:07 -06:00
zandercymatics	cfd6248fc3	Merge branch 'rjm/2349-portfolio-ui' into za/2354-handle-portfolio-edit-mode	2024-07-22 08:45:52 -06:00