Commit graph

7244 commits

Author SHA1 Message Date
Erin
3a82fc44a9
Merge branch 'main' of github.com:cisagov/manage.get.gov into es/2398-sandbox-workflow-completed 2024-07-22 11:27:41 -07: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
Erin
72cbdac286
Merge remote-tracking branch 'origin' into es/2398-sandbox-workflow-completed 2024-07-19 11:26:32 -07: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
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
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
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
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
Erin
7820c36243
Revert workflow name for testing purposes 2024-07-17 14:21:55 -07:00
Erin
f2fd764d67
Correct removed comment job in deploy workflow 2024-07-17 14:20:23 -07:00
Erin
17274a606d
Removed unused comment job from manual deploy 2024-07-17 14:09:50 -07: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
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
zandercymatics
ac3dd401ba
Update user.py 2024-07-17 11:02:13 -06:00
zandercymatics
cea47d1d3d
Bug fix after merge and cleanup 2024-07-17 10:52:27 -06:00
Erin Song
ff2fdf1a5f
Merge pull request #2458 from cisagov/es/2398-sandbox-deploy-workflow
2398: Workflow - Manual deploy branch to environment part 1/2
2024-07-17 09:51:49 -07:00
zandercymatics
f9bca39506
Update csv_export.py 2024-07-17 10:13:32 -06:00
zandercymatics
db5333b372
fix tests 2024-07-17 10:09:56 -06:00
zandercymatics
7dd32baf5e
Update test_reports.py 2024-07-17 10:05:37 -06:00
Rebecca H.
87b0b6c358
Merge pull request #2447 from cisagov/rh/2388-show-details
ISSUE #2388: Fix show detail section
2024-07-17 08:56:36 -07:00
zandercymatics
0a592daaef
Update csv_export.py 2024-07-17 09:26:38 -06:00
zandercymatics
bdec481f8d
use .value 2024-07-17 09:22:25 -06:00
zandercymatics
1433c2c31f
Update csv_export.py 2024-07-17 09:19:32 -06:00
zandercymatics
824be437fd
add strip 2024-07-17 09:14:06 -06:00
zandercymatics
deabe3514b
Update csv_export.py 2024-07-17 09:06:14 -06:00
zandercymatics
7b14b3d27b
Revert "Update csv_export.py"
This reverts commit d05c3c31a9.
2024-07-17 09:04:47 -06:00
zandercymatics
d05c3c31a9
Update csv_export.py 2024-07-17 09:04:39 -06:00
zandercymatics
dd59c9692f
Merge pull request #2419 from cisagov/za/1901-allow-analysts-to-customize-action-needed-emails
Ticket #1901: Allow analysts to customize action needed emails
2024-07-17 08:13:42 -06:00
Rachid Mrad
58957e1250
cleanup 2024-07-16 19:16:57 -04:00
Rachid Mrad
2ec3fa774d
color change 2024-07-16 18:03:15 -04:00