7672 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	b61d92ce3b	Merge branch 'main' into litterbox/2399-fill-senior-official	2024-08-06 13:53:44 -06:00
matthewswspence	bf1d3f1ad7	Clarify test names	2024-08-06 14:39:10 -05: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
zandercymatics	b17252dd12	Remove unused import	2024-08-06 08:19:33 -06:00
zandercymatics	9aa8224103	Fix merge conflict pt 2	2024-08-06 08:15:55 -06:00
zandercymatics	f339266bd0	Update user.py	2024-08-06 08:07:19 -06:00
zandercymatics	dc37551489	Merge branch 'main' into za/2348-csv-export-org-member-domain-export	2024-08-06 08:06:34 -06: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
matthewswspence	dafac97776	print values in error log	2024-08-05 18:14:35 -05:00
matthewswspence	57da90d8a0	add more test cases	2024-08-05 15:36:28 -05:00
matthewswspence	97d2c5e3a2	Remove some small whitespace changes	2024-08-05 15:17:22 -05:00
matthewswspence	62957d2c55	clean up testing changes	2024-08-05 13:47:57 -05:00
CocoByte	9a531d4cec	Updated migration-troubleshooting MD to have a note on usage of reset-db workflow for migration troubleshooting	2024-08-05 12:46:27 -06:00
matthewswspence	477c4f5bd6	Remove logic that causes bug	2024-08-05 13:41:43 -05:00
zandercymatics	b59f77b833	Merge branch 'main' into za/2348-csv-export-org-member-domain-export	2024-08-05 12:32:02 -06:00
CocoByte	0c23aef0bb	Merge remote-tracking branch 'origin/main' into nl/2249-fix-db-reset-workflow	2024-08-05 12:28:50 -06:00
CocoByte	80a3940133	Removed instructions	2024-08-05 12:28:32 -06: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
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