7496 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	dfd66ef86a	Update portfolios.py	2024-08-02 08:37:08 -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
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
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
asaki222	9faaeb7d91	reformatted file	2024-08-01 10:50:56 -04:00
zandercymatics	2edcabe76f	Readd deleted content	2024-08-01 08:34:56 -06:00
David Kennedy	7f112c1295	test functionality	2024-08-01 09:48:51 -04:00
David Kennedy	1ccd59a0aa	formatted for readability	2024-07-31 22:46:26 -04:00
David Kennedy	978ea903e7	formatted for code readability	2024-07-31 22:40:35 -04:00
David Kennedy	7860d8c587	updated existing tests	2024-07-31 22:25:59 -04:00
David Kennedy	1e4e87ae98	merge main	2024-07-31 22:11:46 -04:00
dave-kennedy-ecs	6e3d6bba7e	Merge pull request #2500 from cisagov/dk/2350-portfolio-domain-permissions ... Issue #2350: Portfolio domain permissions	2024-07-31 22:00:39 -04:00
David Kennedy	9bc59fdce0	merge main	2024-07-31 21:53:09 -04:00
David Kennedy	fe5af50100	initial implementation	2024-07-31 21:42:11 -04:00
CocoByte	e0ea11d909	Merge remote-tracking branch 'origin/main' into rh/2406-clipboard	2024-07-31 17:26:48 -06:00
Matt-Spence	152e4c0a2c	Merge pull request #2510 from cisagov/ms-es/2492-Update-Onboarding-Doc ... 2492: Update developer onboarding ticket	2024-07-31 16:11:26 -05:00
matthewswspence	6d25c1fe16	review suggestions	2024-07-31 15:49:56 -05:00
Matt-Spence	2d8e63d23e	Apply suggestions from code review ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-07-31 15:07:02 -05:00
CocoByte	4bc19d020c	Fixed compiler, fixed edge case where copy-paste doesn't work in plain text situations	2024-07-31 14:06:38 -06:00
Matt-Spence	75f8673707	Update developer-onboarding.md	2024-07-31 14:53:21 -05:00
asaki222	723d8ecc80	added uuid	2024-07-31 15:05:46 -04:00
zandercymatics	7eba6b721d	Linting cleanup	2024-07-31 12:20:43 -06:00
zandercymatics	3fafaf2d2a	Update domains_json to reflect the correct data	2024-07-31 12:15:14 -06:00
zandercymatics	117c7e0c42	Rebase logic	2024-07-31 11:55:50 -06:00
Rachid Mrad	f1d896e6b6	cleanup	2024-07-31 13:22:32 -04:00
zandercymatics	a0bfdbf2b1	Merge branch 'za/bugfix-hide-csv-export-button-on-empty' into za/2348-csv-export-org-member-domain-export	2024-07-31 11:16:32 -06:00
zandercymatics	20f9370ef1	Merge branch 'main' into za/2348-csv-export-org-member-domain-export	2024-07-31 11:16:12 -06:00
zandercymatics	49d81f4c58	add check for if the user doesn't have any domains	2024-07-31 11:15:57 -06:00
zandercymatics	280f7cbc1b	Add logic	2024-07-31 11:02:18 -06:00