9712 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	c966fffda2	Merge branch 'main' into za/lint-2737	2024-11-26 15:38:26 -07:00
zandercymatics	4f82b077c0	Add comment @rachidatecs	2024-11-26 14:48:14 -07:00
zandercymatics	7f8c0b9196	fix some tests	2024-11-26 14:46:22 -07:00
CocoByte	e7c22ce51f	linted	2024-11-26 14:40:43 -07:00
Rachid Mrad	95423f294c	cleanup	2024-11-26 16:26:55 -05:00
CocoByte	14071d00b6	icon size change	2024-11-26 14:26:37 -07:00
Rachid Mrad	fe71af74f4	clean up js check	2024-11-26 16:25:15 -05:00
zandercymatics	ac9ea095ed	lint	2024-11-26 14:20:37 -07:00
Rachid Mrad	772c29bb5f	fix handleRequestingEntityFieldset jas and re-merge main	2024-11-26 16:14:04 -05:00
Rachid Mrad	b52cad3910	Merge pull request #3089 from cisagov/el/3012-fixtures-bug ... #3012: Fixtures bug - [EL]	2024-11-26 15:52:21 -05:00
CocoByte	bf34df52dd	resolved merge	2024-11-26 13:37:30 -07:00
CocoByte	36c19d65bf	fixes for unit test (and admin change form)	2024-11-26 13:31:01 -07:00
zandercymatics	e9338520fd	fix js bug on main	2024-11-26 12:18:07 -07:00
zandercymatics	1f88fe5e0a	Merge branch 'main' into za/lint-2737	2024-11-26 12:15:15 -07:00
zandercymatics	82e254af97	lint	2024-11-26 12:15:03 -07:00
zandercymatics	d11bffed01	Merge pull request #3083 from cisagov/za/2737-members-csv-report ... #2737: Members csv report - [MEOWARD]	2024-11-26 11:59:43 -07:00
zandercymatics	d0f0d56620	change enum	2024-11-26 10:58:12 -07:00
Rachid Mrad	da56e86dd0	Merge main with 2594	2024-11-26 12:47:53 -05:00
Rachid Mrad	bdf46b5e3f	2594 JS	2024-11-26 12:46:31 -05:00
zandercymatics	c4a27489cc	more cleanup	2024-11-26 10:45:59 -07:00
zandercymatics	62f0205b4c	Fix merge conflict + enum	2024-11-26 10:41:53 -07:00
Rachid Mrad	5ddffe18e2	declare original_text	2024-11-26 12:35:10 -05:00
Rachid Mrad	4df17d7de0	Fix nearestSpan not defined bug	2024-11-26 12:26:28 -05:00
zandercymatics	e91526e602	cleanup	2024-11-26 10:20:25 -07:00
zandercymatics	f05148f2c3	Merge branch 'za/2737-take-two-members-csv-export' into za/2737-members-csv-report	2024-11-26 10:16:17 -07:00
zandercymatics	2f93ad9356	enums and the like	2024-11-26 10:15:25 -07:00
zandercymatics	7c1e232d6b	cleanup	2024-11-26 10:14:44 -07:00
Rachid Mrad	67a8cf425d	Add missing getCsrfToken import	2024-11-26 12:07:07 -05:00
Rachid Mrad	e1ff54d264	revise while True	2024-11-26 11:54:11 -05:00
Rachid Mrad	822f96651e	merge main	2024-11-26 11:33:36 -05:00
Rachid Mrad	7c9b15efd2	Fix duplicate portfolio permission error	2024-11-26 11:32:45 -05:00
Rachid Mrad	3b091b0dc3	Update src/registrar/assets/src/js/getgov/main.js ... Co-authored-by: zandercymatics <141044360+zandercymatics@users.noreply.github.com>	2024-11-26 11:29:07 -05:00
asaki222	8a58070ac1	Merge pull request #3066 from cisagov/hotgov/2594-design-review ... 2594 design review - [HOTGOV]	2024-11-26 11:15:34 -05:00
Matt-Spence	a7ea0e89ef	Merge pull request #3093 from cisagov/ms/2826-self-host-select2 ... #2826: self host select2 - [MS]	2024-11-26 10:55:12 -05:00
zandercymatics	a77eb59089	Merge branch 'za/2737-members-csv-report' of github.com:cisagov/manage.get.gov into za/2737-members-csv-report	2024-11-26 08:50:54 -07:00
zandercymatics	a7fd3b9470	Merge branch 'main' into za/2737-members-csv-report	2024-11-26 08:50:09 -07:00
zandercymatics	d354f04bf1	Update src/registrar/utility/csv_export.py ... Co-authored-by: Alysia Broddrick <109625347+abroddrick@users.noreply.github.com>	2024-11-26 08:48:02 -07:00
Matthew Spence	d016571309	Merge branch 'main' into ms/2826-self-host-select2	2024-11-26 09:32:18 -06:00
CocoByte	ae975ed9f8	Updated all error messages to have error icon	2024-11-25 19:46:53 -07:00
zandercymatics	2b5a5fe7ca	undo some past changes	2024-11-25 16:00:20 -07:00
zandercymatics	958e010c5a	Update csv_export.py	2024-11-25 15:36:43 -07:00
CocoByte	c0a0ac3ed2	linted	2024-11-25 15:35:00 -07:00
zandercymatics	4013815a04	Update csv_export.py	2024-11-25 15:33:47 -07:00
CocoByte	31563152da	cleanup	2024-11-25 15:32:53 -07:00
zandercymatics	e2bd982c27	Update portfolio_members_json.py	2024-11-25 15:27:34 -07:00
zandercymatics	e813791033	Update csv_export.py	2024-11-25 15:26:56 -07:00
CocoByte	0446aaba60	unit test fixes	2024-11-25 15:26:22 -07:00
zandercymatics	859e8b3bfa	remove model annotations file	2024-11-25 15:26:04 -07:00
CocoByte	e75c027738	Fixed annotations and sort	2024-11-25 15:16:04 -07:00
zandercymatics	725441da70	Allow create portfolio script to run for multiple	2024-11-25 14:59:53 -07:00