7409 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
CocoByte	f7caee0d11	fixed unit tests	2024-07-30 20:23:45 -06:00
CocoByte	9a5b07c79f	Added logic for case when there are NO additional contacts	2024-07-30 19:49:47 -06:00
CocoByte	892c8331b3	Fixed logic for different display options of "other contacts"	2024-07-30 19:41:26 -06:00
CocoByte	7b56562417	Fixed error with javascript file, more styling	2024-07-30 18:45:44 -06:00
CocoByte	0953e50bb0	styling updates	2024-07-30 17:39:02 -06:00
CocoByte	9111b24891	Merge remote-tracking branch 'origin/main' into rh/2406-clipboard	2024-07-30 16:05:29 -06:00
CocoByte	e446aa9511	copy logic updates, icon updates	2024-07-30 16:05:15 -06:00
Rebecca H.	5d47c417f3	Merge pull request #2504 from cisagov/rh/2471-update-finish-profile ... ISSUE #2471: Match Up User Profile Fields	2024-07-30 14:42:31 -07:00
CocoByte	53e1fe9693	update code for extracting "other contact" details	2024-07-30 13:31:38 -06:00
CocoByte	57ba291434	Merge remote-tracking branch 'origin/main' into rh/2406-clipboard	2024-07-30 12:52:19 -06:00
Rachid Mrad	6637c0f9b1	Merge pull request #2499 from cisagov/rjm/2377-portfolio-org-page ... Issues #2377 #2501: Portfolio org page - [RJM]	2024-07-29 20:41:00 -04:00
Rachid Mrad	5d5d9318c1	lint	2024-07-29 18:40:40 -04:00
Rachid Mrad	137030e58a	merge main	2024-07-29 16:35:09 -04:00
dave-kennedy-ecs	44bd2429d3	Merge pull request #2464 from cisagov/dk/2250-test-suite ... Issue #2250: improvements to test suite	2024-07-29 14:32:37 -04:00
David Kennedy	bb9fe819d7	formatted for code readability	2024-07-29 13:58:56 -04:00
David Kennedy	8e3c821aa0	merge main	2024-07-29 13:52:51 -04:00
David Kennedy	1165dcadab	fixes from review comments	2024-07-29 07:06:14 -04:00
David Kennedy	587b268e38	fixed up some additional cleanups/tearDowns	2024-07-26 17:47:21 -04:00
zandercymatics	279fca4979	Merge pull request #2463 from cisagov/za/2323-domain-manager-csv-export ... Ticket #2323: Domain manager csv export	2024-07-26 11:51:16 -06:00
Rebecca Hsieh	b058365673	Swap placement	2024-07-26 10:44:57 -07:00
David Kennedy	e12115b596	streamlined cleanup in test_admin.py	2024-07-26 13:19:33 -04:00
Rebecca H.	cc043b5c91	Merge pull request #2477 from cisagov/rh/1261-hide-urbanization ... ISSUE #1261: Hide urbanization field if non-PR	2024-07-26 08:07:32 -07:00
zandercymatics	1f4d369668	Update domains_table.html	2024-07-26 08:20:08 -06:00
zandercymatics	3ea9dc17bf	Fix run.sh	2024-07-25 12:01:03 -06:00
zandercymatics	a29cb94023	Merge branch 'main' into za/2323-domain-manager-csv-export	2024-07-25 10:52:28 -06:00
zandercymatics	799cbe2f85	Update domains_table.html	2024-07-25 10:41:35 -06:00
zandercymatics	8f411a8342	Add margin right to button	2024-07-25 10:18:51 -06:00
CuriousX	4725b6f993	Merge pull request #2449 from cisagov/nl/2359-portfolio-inline-domaingroups-and-suborgs ... Issue #2359: Manage Domain Groups and Suborgs in Portfolio admin [litterbox]	2024-07-25 10:04:59 -06:00
zandercymatics	9ac642e61b	Add max width	2024-07-25 09:57:25 -06:00
Rachid Mrad	bf031e1781	Fix state required field on domain management	2024-07-25 11:55:29 -04:00
zandercymatics	a3e4b61f26	Initial PR suggestions ... Reduced icon spacing, changed text	2024-07-25 09:16:10 -06:00
Rachid Mrad	2c4c528678	lint and test	2024-07-24 21:22:46 -04:00
Rachid Mrad	203c01843a	portfolio org view	2024-07-24 20:31:41 -04:00
CocoByte	5fd9c02c2e	merged (and resolved conflict)	2024-07-24 14:20:06 -06:00
CuriousX	e8d93bcb8c	Merge pull request #2445 from cisagov/nl/2426-federal-agency-read-only-bug ... Issue #2426 - fixes federal agency read only bug [rb]	2024-07-24 11:31:18 -06:00
dave-kennedy-ecs	af45eb508d	Merge pull request #2481 from cisagov/bob/1762-joined-messages-bug ... Issue #1762: Clear warning messages on Contact save	2024-07-24 08:35:58 -04:00
dave-kennedy-ecs	20f075a4cf	Merge pull request #2474 from cisagov/rjm/2366-portfolio-permissions ... Issue #2366: Infra for portfolio permissions	2024-07-24 08:09:14 -04:00
David Kennedy	5edb329bcd	cleanup	2024-07-24 08:04:18 -04:00
CocoByte	b7622a00b9	linted	2024-07-23 21:18:13 -06:00
CocoByte	cfd02700e1	quick fix	2024-07-23 20:35:45 -06:00
CocoByte	711c71c114	Catching edge-cases	2024-07-23 14:37:58 -06:00
CocoByte	72fdcfdac0	more formatting fixes	2024-07-23 14:22:10 -06:00
David Kennedy	d84e5d9a39	fixed tests and linted	2024-07-23 16:06:25 -04:00
CocoByte	4666da4df7	fix wierd typo	2024-07-23 13:50:40 -06:00
CocoByte	c33a4b61f5	fixed formatting	2024-07-23 13:42:02 -06:00
Rachid Mrad	0c8307c07e	hide portfolio fields for analysts if no waffle flag	2024-07-23 13:24:13 -04:00
CocoByte	b245dfb2fe	fixed dom extraction	2024-07-23 10:55:02 -06:00
zandercymatics	e302eecf67	Update responsiveness after merge	2024-07-23 10:29:03 -06:00
Rachid Mrad	661d2d7a22	make portfolio a combo box on user edit model	2024-07-23 12:07:53 -04:00
zandercymatics	c7c709484e	Merge branch 'main' into za/2323-domain-manager-csv-export	2024-07-23 09:57:17 -06:00