7263 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
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
CuriousX	76d9b8cb8c	Merge pull request #2457 from cisagov/nl/2439-user-phone-readonly ... (DRAFT - needs sandbox) #2439 - Make user phone number field read only for analysts	2024-07-19 12:13:18 -06:00
Rachid Mrad	c162d8139a	merge main	2024-07-19 12:04:49 -04:00
Matthew Spence	a3640e263e	incorporate review suggestions	2024-07-19 09:28:16 -06:00
Matthew Spence	242d625f8d	Merge remote-tracking branch 'origin/main' into ms/update-dev-onboarding-template	2024-07-19 09:20:04 -06:00
Rebecca H.	acf52767a7	Merge pull request #2478 from cisagov/rh/fix-versioning ... Remove versioning in docker-compose.yml	2024-07-19 08:12:34 -07:00
Rebecca Hsieh	07727bfdd5	Adding change for sandbox and development	2024-07-19 08:04:23 -07:00
Rachid Mrad	acf89e79c1	trigger pr	2024-07-18 23:48:20 -04:00
Rebecca Hsieh	4d25aeb41f	npm load fix	2024-07-18 14:54:08 -07:00
Rebecca Hsieh	20c8afaace	Remove version	2024-07-18 14:27:31 -07:00
Rachid Mrad	e3415a3de9	lint	2024-07-18 16:33:18 -04:00
Rachid Mrad	d8fce10016	merge main	2024-07-18 16:31:10 -04:00
Rachid Mrad	716f91e3b7	Hide suborgs on domains for regular users	2024-07-18 16:24:18 -04:00
Katherine-Osos	e6ba993282	Merge pull request #2476 from cisagov/ko/modify-email-text ... Remove "demonstrate eligibility" text	2024-07-18 14:22:33 -05:00
David Kennedy	65bed05284	fixed zap.conf	2024-07-18 14:36:31 -04:00
David Kennedy	e6e76fe8d8	owasp fix	2024-07-18 14:22:58 -04:00
David Kennedy	ebc578d16f	fix a migration issue	2024-07-18 14:10:46 -04:00
Katherine-Osos	b6724f7750	Update src/registrar/templates/emails/status_change_rejected.txt ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-07-18 13:05:05 -05:00
David Kennedy	e9ba08f20a	small refactor	2024-07-18 13:48:27 -04:00
Kaitlin Abbitt	2ff6498f57	Merge pull request #2335 from cisagov/2263-notifications-by-label ... Add Github action to notify users by labels added to issues	2024-07-18 11:33:58 -06:00
Katherine-Osos	868744d64b	Remove "demonstrate eligibility" text	2024-07-18 12:13:36 -05:00
katypies	f06fb60325	Newline at end of file	2024-07-18 11:09:04 -06:00
David Kennedy	d51649dfba	linting	2024-07-18 12:47:04 -04:00
Rachid Mrad	4c5456d20b	Merge pull request #2443 from cisagov/bob/2353-edit-icon-domain-overview ... Issue #2353: Add edit icon to domains overview page - [BOB]	2024-07-18 12:43:35 -04:00
David Kennedy	51509e8b13	fixed unit tests, updated context processor	2024-07-18 12:31:13 -04:00
David Kennedy	1b25be8d96	minor fix to context processors	2024-07-18 12:15:27 -04:00
Rachid Mrad	17997259ef	cleanup	2024-07-17 21:14:20 -04:00
Rachid Mrad	cb3b1fd7fa	lint	2024-07-17 21:12:16 -04:00
Rachid Mrad	ea6ccae948	unit tests	2024-07-17 21:04:59 -04:00
Alysia Broddrick	fd7cbf822c	Merge pull request #2469 from cisagov/dk/2468-domains-without-security-contacts-incorrectly-displayed ... (Based on staging) Ticket #2468: Fix incorrect display for security contacts on reports	2024-07-17 15:27:40 -07:00
Rachid Mrad	72ee81a43c	handle DJA ui and handle permission test for UserDomainRole	2024-07-17 15:38:38 -04:00
zandercymatics	502f6b9444	Merge pull request #2423 from cisagov/za/profile-page-update-label ... (on getgov-za) Ticket #2421/#2422: Missing first name and last name gets a green checkmark next to “Unknown” and make field label consistent	2024-07-17 13:09:23 -06:00
zandercymatics	b3b8328007	Update test_reports.py	2024-07-17 12:15:46 -06:00
zandercymatics	a795cc519c	Temp content	2024-07-17 12:06:24 -06:00
Rachid Mrad	777be646a4	working permissions	2024-07-17 13:57:04 -04:00
zandercymatics	57bf284291	add additional check	2024-07-17 11:17:41 -06:00
zandercymatics	2d1ae881eb	Merge branch 'main' into za/profile-page-update-label	2024-07-17 11:02:17 -06:00