7800 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Rachid Mrad	cc3ae1efcc	merge main	2024-08-02 13:47:06 -04:00
Rachid Mrad	53d9f69420	clean up merge errors	2024-08-02 13:46:00 -04:00
zandercymatics	22bdb1d3b0	More content	2024-08-02 11:40:18 -06:00
dave-kennedy-ecs	5bbd533c38	Merge pull request #2533 from cisagov/dk/2379-hotfix ... Issue #2379: Hotfix for portfolio waffle flag not being checked in all templates	2024-08-02 13:31:56 -04:00
Rachid Mrad	d8fd49fa10	cleanup	2024-08-02 13:19:09 -04:00
Erin Song	60e48f5ef9	Merge pull request #2486 from cisagov/es/2398-sandbox-workflow-completed ... 2398: Complete manual deploy workflow 2/2	2024-08-02 10:16:33 -07:00
Rachid Mrad	c8797e77dd	merge main	2024-08-02 13:12:02 -04:00
David Kennedy	77c1673479	update to context_processor	2024-08-02 13:10:46 -04:00
Erin Song	4e66684471	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into es/2398-sandbox-workflow-completed	2024-08-02 09:21:51 -07:00
zandercymatics	808c699027	Update domain_sidebar.html	2024-08-02 10:15:28 -06:00
zandercymatics	9dc8febf02	Merge branch 'gd/2354-handle-portfolio-edit-mode' into za/2352-portfolio-user-can-view-and-update-suborgs	2024-08-02 10:12:11 -06:00
zandercymatics	5796df0531	Cleanup (once again)	2024-08-02 09:47:39 -06:00
Cameron Dixon	25b9484a7a	Update domain_request_dotgov_domain.html ... Updating in line with https://github.com/cisagov/get.gov/pull/311	2024-08-02 11:41:03 -04:00
zandercymatics	a8b362e32e	Fix merge conflicts pt 2	2024-08-02 09:40:48 -06:00
zandercymatics	0814b86227	Update domains_json.py	2024-08-02 09:31:01 -06:00
zandercymatics	e91af30b9e	Update context_processors.py	2024-08-02 09:10:42 -06:00
zandercymatics	2769a9e5ba	Fix merge conflicts	2024-08-02 09:05:47 -06:00
zandercymatics	dc70758603	Add context	2024-08-02 08:47:16 -06:00
zandercymatics	083d34f764	Cleanup unused imports	2024-08-02 08:38:24 -06:00
zandercymatics	dfd66ef86a	Update portfolios.py	2024-08-02 08:37:08 -06:00
zandercymatics	0c90419b47	Fix migrations after merge conflict	2024-08-02 08:34:54 -06:00
zandercymatics	1e0a46f5fc	Fix merge conflicts	2024-08-02 08:32:30 -06:00
zandercymatics	e827314f78	Add spacing for linter	2024-08-02 07:58:33 -06:00
zandercymatics	7e3f56e0f6	Merge branch 'main' into litterbox/2399-fill-senior-official	2024-08-02 07:54:02 -06:00
zandercymatics	08c16a7ad3	Merge branch 'main' into gd/2354-handle-portfolio-edit-mode	2024-08-02 07:53:17 -06:00
zandercymatics	a4f1170349	Merge branch 'main' into za/2348-csv-export-org-member-domain-export	2024-08-02 07:50:38 -06:00
dave-kennedy-ecs	eb8c7a16c1	Merge pull request #2527 from cisagov/dk/2379-portfolio-domain-readonly-permissions ... Issue #2379: portfolio domain readonly view	2024-08-01 20:26:19 -04:00
David Kennedy	e0392920b8	fixed a test for view icon	2024-08-01 18:54:41 -04:00
David Kennedy	e614a0e6be	improved handling of edge case where no portfolio defined	2024-08-01 18:41:43 -04:00
David Kennedy	9a6f5fc408	Merge branch 'main' into dk/2379-portfolio-domain-readonly-permissions	2024-08-01 18:10:48 -04:00
David Kennedy	1dfe34d9c6	fixed view icon	2024-08-01 18:09:54 -04:00
CuriousX	bb3cfa0e2a	Merge pull request #2472 from cisagov/rh/2406-clipboard ... Issue #2406: Clipboard Functionality [backup]	2024-08-01 13:16:47 -06:00
CocoByte	ae7ea346a4	Merge remote-tracking branch 'origin/main' into rh/2406-clipboard	2024-08-01 13:04:02 -06:00
CocoByte	5b22860295	un-smushed plain text by adding \n. linted	2024-08-01 13:03:53 -06:00
Rebecca H.	b78f753b2a	Merge pull request #2516 from cisagov/rh/2475-add-election ... ISSUE #2475: Update for organization to have " - election"	2024-08-01 12:02:45 -07:00
Rebecca H.	4b2919d108	Update src/registrar/models/domain_request.py ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-08-01 11:55:36 -07:00
Rachid Mrad	3e70b344e3	cleanup	2024-08-01 14:26:13 -04:00
Rachid Mrad	aedb05dd34	fix unit test	2024-08-01 14:16:45 -04:00
Rachid Mrad	165e27307b	fix federal agency	2024-08-01 14:10:20 -04:00
Alysia Broddrick	5b81389262	Merge pull request #2529 from cisagov/new-dev-sandbox-ad ... Add new developer sandbox 'ad' infrastructure	2024-08-01 11:02:43 -07:00
Alysia Broddrick	056bc21452	added missing ad mentions	2024-08-01 10:58:45 -07:00
zandercymatics	a92ae0f3d6	Merge pull request #2528 from cisagov/hotgov/bugfix-fix-csv-export-display ... BUGFIX: Fix html for "Export as CSV button"	2024-08-01 11:41:37 -06:00
Matt-Spence	0c8b90850d	Update docs/developer/README.md ... Co-authored-by: Erin Song <121973038+erinysong@users.noreply.github.com>	2024-08-01 12:11:39 -05:00
Cameron Dixon	e5ddcfe208	Merge pull request #2344 from cisagov/h-m-f-t-patch-1 ... Update domain_invitation_description.html to give better direction to analysts	2024-08-01 12:31:32 -04:00
Cameron Dixon	c6943daa21	Update src/registrar/templates/django/admin/includes/descriptions/domain_invitation_description.html ... Co-authored-by: Katherine-Osos <119689946+Katherine-Osos@users.noreply.github.com>	2024-08-01 12:21:29 -04:00
zandercymatics	ec88af56c3	Update domains_json.py	2024-08-01 09:59:43 -06:00
zandercymatics	86f040e4b7	Reapply "Merge branch 'main' into za/2348-csv-export-org-member-domain-export" ... This reverts commit 8becad8186.	2024-08-01 09:53:59 -06:00
zandercymatics	8becad8186	Revert "Merge branch 'main' into za/2348-csv-export-org-member-domain-export" ... This reverts commit 4118bf17f9, reversing changes made to 7eba6b721d.	2024-08-01 08:58:38 -06:00
asaki222	7e64076fa9	Merge pull request #2525 from cisagov/ag/adding-permissions-to-test-accounts ... added uuid and name to fixtures.py	2024-08-01 10:56:26 -04:00
zandercymatics	4118bf17f9	Merge branch 'main' into za/2348-csv-export-org-member-domain-export	2024-08-01 08:53:54 -06:00