Commit graph

8085 commits

Author SHA1 Message Date
asaki222
a55c0191ac
put the end tag back in its correct spot 2024-09-13 13:02:49 -04:00
asaki222
d386e69c9d
closed a tag 2024-09-11 16:49:30 -04:00
asaki222
91532adc30
updated to main 2024-09-11 16:36:58 -04:00
asaki222
e7936cef5f
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into meoward/2591-Remove-Profile-feature-flag 2024-09-11 16:36:30 -04:00
asaki222
ba4713b7a8
Merge pull request #2710 from cisagov/ad/1405-fix-for-adding-a-duplicate-email-to-provide-warning-message
Ad/1405 fix for adding a duplicate email to provide warning message
2024-09-11 14:51:50 -04:00
asaki222
6e80bc8c00
Merge branch 'main' of https://github.com/cisagov/manage.get.gov into ad/1405-fix-for-adding-a-duplicate-email-to-provide-warning-message 2024-09-11 14:35:00 -04:00
asaki222
2069ab0d22
reverted the artifact change 2024-09-11 14:34:55 -04:00
zandercymatics
8d890e3f25
Merge pull request #2744 from cisagov/za/fix-katherine-fixture-user-email
Bugfix: Katherines email is listed incorrectly in fixtures
2024-09-11 09:35:44 -06:00
asaki222
a28b8a3af6
Merge pull request #2743 from cisagov/fix-for-django-security-check
updated actions/upload-artifact to version4 due to failing checks for prs
2024-09-11 11:25:45 -04:00
zandercymatics
7eaba2c56b
Update fixtures_users.py 2024-09-11 08:45:54 -06:00
asaki222
e921334a26
updated actions/upload-artifact to version4 due to failing checks 2024-09-11 10:25:53 -04:00
asaki222
60dedcde4e
updated upload-artifact 2024-09-11 10:19:48 -04:00
asaki222
5651b57d1e
updated upload-artifact 2024-09-11 10:19:26 -04:00
asaki222
31b7daf564
added an is 2024-09-11 09:50:47 -04:00
asaki222
aa01036e0f
updated text 2024-09-11 09:49:19 -04:00
asaki222
519c942843
made changes to the tests 2024-09-10 17:36:50 -04:00
asaki222
b17ef347c4
reverted tests 2024-09-10 13:29:21 -04:00
asaki222
6d57f5115b
fixed linting issues 2024-09-10 12:05:34 -04:00
dave-kennedy-ecs
67a81b53ea
Merge pull request #2718 from cisagov/backup/2717-domain-table-filter
Issue #2717: Domain table filtering for portfolio user with VIEW_MANAGED_DOMAINS
2024-09-10 11:59:20 -04:00
asaki222
acfaaa0b14
removed unused reference 2024-09-10 11:52:17 -04:00
asaki222
1203e54352
ran formatting command 2024-09-10 11:27:32 -04:00
asaki222
f7c3579a93
removed submitter 2024-09-10 10:31:52 -04:00
asaki222
db46ca9fe4
adding back some conditionals for feature flag 2024-09-10 10:27:28 -04:00
asaki222
8954efb537
remvoed all reference to profile feature flag in code 2024-09-09 17:16:18 -04:00
asaki222
c2bdfaaa36
final changes 2024-09-09 15:26:00 -04:00
asaki222
32e3d2f9c6
removed the profile_feature_flag from send_status_update_emailmethod 2024-09-09 12:26:59 -04:00
asaki222
2e3f4bdf0c
removed profile feature flag reference from process view method 2024-09-09 11:36:01 -04:00
asaki222
44c911e320
removed method to add has_profile_feature_flag to context, and reference 2024-09-09 11:32:34 -04:00
Matt-Spence
3a7044d31e
Merge pull request #2733 from cisagov/ms/fix-typehint-linter-errors
Hotfix: fix linter errors
2024-09-09 10:26:23 -05:00
matthewswspence
872f943220
unused import 2024-09-09 10:10:04 -05:00
matthewswspence
ffaf3b5a37
fix linter errors 2024-09-09 10:00:34 -05:00
zandercymatics
8573950236
Merge pull request #2707 from cisagov/dk/2667-waffle-flags-org
Issue #2667: Add waffle flags for organization requests and organization features
2024-09-09 08:36:41 -06:00
zandercymatics
d1b4054f0f
Merge branch 'main' into dk/2667-waffle-flags-org 2024-09-09 08:23:08 -06:00
Matt-Spence
1cc2840ff7
Merge pull request #2656 from cisagov/ms/2560-update-first-ready-values
Issue #2560 update first ready values
2024-09-06 15:30:16 -05:00
Rachid Mrad
59b647b1a7
Merge pull request #2649 from cisagov/bob/2579-analyst-merge-user-accounts
Issue #2579 #2644: Analyst can merge user accounts - [BOB]
2024-09-06 15:44:42 -04:00
Rachid Mrad
db593fcb6e
merge cleanup 2024-09-06 13:57:28 -04:00
Rachid Mrad
73e3ced96a
merge main 2024-09-06 13:51:18 -04:00
Matthew Spence
a2291d75ed
doc fixes 2024-09-06 10:27:52 -05:00
David Kennedy
008b9d57a5
cleanup 2024-09-06 08:58:28 -04:00
David Kennedy
467536600e
limit domains_json view to domains based on user's portfolio permissions 2024-09-06 08:56:27 -04:00
CuriousX
ae143e78cd
Merge pull request #2706 from cisagov/nl/2696-suborg-sort-button-fix
Issue #2696: Suborganization sort button fix
2024-09-05 21:40:27 -06:00
CocoByte
f158b71b39
Resolved merge conflicts 2024-09-05 21:33:00 -06:00
Rachid Mrad
cebbd42ce6
Merge pull request #2655 from cisagov/hotgov/2544-design-review
Issue #2544: Design review on view and manage domains, org feature - [HOTGOV]
2024-09-05 12:21:54 -04:00
David Kennedy
49110461ef
lint 2024-09-05 12:10:49 -04:00
Rachid Mrad
a6b9d79fad
cleanup comments 2024-09-05 12:07:57 -04:00
Rachid Mrad
33191ae919
Merge pull request #2622 from cisagov/rjm/2521-portfolio-members-admin
Issue #2521: Django admin portfolio members section - [RJM]
2024-09-05 12:03:10 -04:00
asaki222
68b8a6086b
formated changes 2024-09-04 19:53:44 -04:00
asaki222
ef30e06b89
added back the sucess message under else 2024-09-04 18:32:07 -04:00
asaki222
0d00bd467d
removed spacing 2024-09-04 18:27:57 -04:00
asaki222
236aac02b0
an error occured 2024-09-04 18:27:32 -04:00