9493 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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	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
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
zandercymatics	4013815a04	Update csv_export.py	2024-11-25 15:33:47 -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
zandercymatics	859e8b3bfa	remove model annotations file	2024-11-25 15:26:04 -07:00
asaki222	c605dcbd5a	updates	2024-11-25 15:22:19 -05:00
asaki222	7e0cdb813c	updates	2024-11-25 15:20:30 -05:00
asaki222	f440f1ac1c	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into hotgov/2594-design-review	2024-11-25 13:14:04 -05:00
zandercymatics	0b69a5b0c2	Remove js for style	2024-11-25 10:20:34 -07:00
zandercymatics	04365fbf87	Merge branch 'main' into hotgov/2594-design-review	2024-11-22 14:05:37 -07:00
Matthew Spence	4677282c9f	Merge branch 'main' of https://github.com/cisagov/manage.get.gov	2024-11-22 09:08:03 -06:00
zandercymatics	4eb54319b7	Update src/registrar/utility/csv_export.py	2024-11-21 08:32:42 -07:00
Rachid Mrad	ff8a4a3fa1	clean up test users	2024-11-20 21:42:40 -05:00
Rachid Mrad	03d3d109dc	remove junk from gitignore	2024-11-20 21:34:55 -05:00
Rachid Mrad	74bb8edcb1	try to track sass folder removal in git	2024-11-20 21:32:21 -05:00
Rachid Mrad	9a5ada645c	Refactor directories and filenames	2024-11-20 21:13:19 -05:00
Rachid Mrad	1445e1bf61	Fix unit tests	2024-11-20 20:52:59 -05:00
Rachid Mrad	e6035ed0b2	remove extra scss that only produces a console log error	2024-11-20 20:37:22 -05:00
Rachid Mrad	a61f810223	add missing dependency to table members	2024-11-20 20:29:01 -05:00
Rachid Mrad	e24a30ecb3	Fix function name	2024-11-20 20:22:33 -05:00
Rachid Mrad	74ef42095e	Fix param for BaseTable	2024-11-20 20:05:07 -05:00
Rachid Mrad	90a608c0e7	Hand merge 3100	2024-11-20 20:00:58 -05:00
Rachid Mrad	69e3208fe9	merge main	2024-11-20 19:54:02 -05:00
Rachid Mrad	de76280a72	Fix function calls	2024-11-20 19:43:11 -05:00
Rachid Mrad	80f42271d0	mege main	2024-11-20 19:41:54 -05:00
Rachid Mrad	1e16aeffb4	hand merge kebab js	2024-11-20 19:40:24 -05:00
asaki222	2a3f67b5ce	updated	2024-11-20 16:21:11 -05:00