7592 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Erin Song	fa274297ad	Content change for consistency	2024-08-08 12:51:20 -07:00
Erin Song	4e7db536c3	Add line break	2024-08-08 12:50:07 -07:00
Erin Song	546a74f638	Update ssh instructions to clarify filepath versus key	2024-08-08 12:46:03 -07:00
Erin Song	808b8329a4	Reorder gpg and ssh instructions	2024-08-08 12:32:49 -07:00
zandercymatics	25d3a540af	Merge pull request #2491 from cisagov/gd/2354-handle-portfolio-edit-mode ... Ticket #2354: Read-only suborganization view	2024-08-08 08:03:18 -06:00
asaki222	e573b238ed	Merge pull request #2545 from cisagov/ad/fix-creator-field-on-portfolio-page ... #2480 - Creator field on portfolio page should not be selectable	2024-08-07 18:41:50 -04:00
asaki222	d8ed5e4f7b	reformmatted	2024-08-07 17:45:41 -04:00
zandercymatics	d5e28878e5	Merge pull request #2507 from cisagov/litterbox/2399-fill-senior-official ... Ticket #2399: Fill senior official table and update SO tables [MIGRATIONS]	2024-08-07 13:56:19 -06:00
asaki222	b5330e1c38	added check if creator exists	2024-08-07 14:59:17 -04:00
zandercymatics	2fd9611ca1	Fix variable naming	2024-08-07 11:50:59 -06:00
zandercymatics	324a1a29c5	Linting	2024-08-07 09:33:21 -06:00
zandercymatics	bf64eb2114	Changes to fit new requirements	2024-08-07 09:24:40 -06:00
asaki222	46769cb8a6	reformatted	2024-08-06 17:09:19 -04:00
asaki222	046b1a8438	removed if statement that checks if creator is None	2024-08-06 16:45:05 -04:00
asaki222	76e5b8480d	made field readonly	2024-08-06 16:33:08 -04:00
zandercymatics	b97070009f	Update terminal_helper.py	2024-08-06 14:31:50 -06:00
zandercymatics	bf9169d22d	Add PR suggestions	2024-08-06 14:30:37 -06:00
zandercymatics	f87e71c10a	fix migrations	2024-08-06 13:55:05 -06:00
zandercymatics	b61d92ce3b	Merge branch 'main' into litterbox/2399-fill-senior-official	2024-08-06 13:53:44 -06:00
Cameron Dixon	811e5d5eda	Merge pull request #2531 from cisagov/cd/clarify-ii ... Update request form with new language on naming rules	2024-08-06 12:12:12 -04:00
Matt-Spence	a111b7f8f1	Merge pull request #2487 from cisagov/ms/2294-update-fsm-diagram ... Link to new FSM diagram in developer README	2024-08-05 20:52:26 -05:00
Matt-Spence	c76209d291	Merge pull request #2509 from cisagov/ms/add-certs-to-gitignore ... add another cert format and a cert folder to .gitignore	2024-08-05 20:52:15 -05:00
zandercymatics	5d8d01d6be	Merge branch 'main' into gd/2354-handle-portfolio-edit-mode	2024-08-05 10:18:14 -06:00
zandercymatics	78bce8ef48	Add test for suborg directly ... The last test was implicit - though we should really have an explicit one, too. Especially for the follow-on PR	2024-08-05 09:53:30 -06:00
zandercymatics	eb487bbc5e	Merge branch 'main' into gd/2354-handle-portfolio-edit-mode	2024-08-02 13:33:18 -06:00
Rachid Mrad	f12c71ab16	Merge pull request #2515 from cisagov/rjm/2505-org-view-only ... Issue #2505: Read-only view for portfolio org page - [RJM]	2024-08-02 15:32:04 -04:00
Rachid Mrad	85f51ef142	Fix unit tests	2024-08-02 14:11:21 -04:00
Rachid Mrad	226696ddcb	merge main - again	2024-08-02 14:05:40 -04:00
Rachid Mrad	33234ac4ea	Merge pull request #2526 from cisagov/bob/2367-portfolio-invitation ... Issue #2367: Portfolio invitation backend - MIGRATION - [BOB]	2024-08-02 14:01:05 -04:00
Rachid Mrad	cfc0973a84	solidify requests table perms	2024-08-02 13:55:14 -04:00
Rachid Mrad	94cda46baf	solidify domains permissions	2024-08-02 13:53:17 -04:00
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
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
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	083d34f764	Cleanup unused imports	2024-08-02 08:38:24 -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
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