9368 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
dave-kennedy-ecs	5b7a6678c6	Merge pull request #3094 from cisagov/bob/2899-suppress-blue-box ... #2899: don't show blue box when analyst clicks 'Manage Domain'	2024-11-20 15:33:53 -05:00
Rebecca H.	3bba70ca35	Merge pull request #3100 from cisagov/rh/fix-domain-request-deletion ... Bug Fix: New Domain Request Deletion Error - [RH]	2024-11-20 12:17:40 -08:00
Rebecca Hsieh	46d3f9f0b4	Fix bug where domain request could not delete	2024-11-20 10:32:22 -08:00
Rachid Mrad	8eb5528304	Merge pull request #3072 from cisagov/cb/2494-banner-boilerplates ... #2494: Banner boilerplates - [CB]	2024-11-20 13:08:30 -05:00
Rachid Mrad	6bba76c092	merge main	2024-11-20 12:37:42 -05:00
Rachid Mrad	fc53832c56	Merge pull request #3071 from cisagov/rjm/2941-dja-table-headers ... #2941: Add a th with text Action for the DJA table rows that have copy buttons - [RJM]	2024-11-20 12:36:07 -05:00
Rachid Mrad	e2f4cf9d00	source-map	2024-11-19 20:02:41 -05:00
Rachid Mrad	71e6e9240e	Move back helpers into the watched folders	2024-11-19 19:57:27 -05:00
Rachid Mrad	58db81c41d	merge	2024-11-19 19:40:50 -05:00
Rachid Mrad	9fb2828a14	admin js modules	2024-11-19 19:37:21 -05:00
Rachid Mrad	6187c7bbcb	admin js modules	2024-11-19 19:36:09 -05:00
Rebecca H.	11db76496a	Merge pull request #2968 from cisagov/rh/2764-kebob-extra-spicy ... #2764: Adding Kebabs + Delete Functionality + Modals for the Members Table and Member Profile Page - [RH]	2024-11-19 14:56:12 -08:00
Alysia Broddrick	3d168e0574	undid browser test	2024-11-19 14:29:45 -08:00
Alysia Broddrick	2e9912d3df	testing build fix	2024-11-19 14:22:27 -08:00
Rachid Mrad	073b488e3c	test git tracking of admin js	2024-11-19 11:42:26 -05:00
Rachid Mrad	e50f945dc3	modules admin source directory	2024-11-19 11:41:35 -05:00
Rachid Mrad	5cddb60f33	infra for admin js	2024-11-19 11:32:42 -05:00
Rachid Mrad	7d92949e46	formatting	2024-11-18 19:59:43 -05:00
Rachid Mrad	4dec61990c	wip	2024-11-18 19:46:40 -05:00
Rachid Mrad	6d8057255e	Lock uswds version	2024-11-18 19:41:09 -05:00
Rachid Mrad	07876c74b0	wip	2024-11-18 19:17:13 -05:00
asaki222	bb58b77467	Merge pull request #3069 from cisagov/ad/1604-allow-analysts-to-view-cancelled-invitations ... #1604 allow analysts to view cancelled invitations - [AD]	2024-11-18 16:04:43 -05:00
asaki222	616167a63b	fixed typo	2024-11-18 15:40:38 -05:00
asaki222	629419f141	Merge branch 'ad/1604-allow-analysts-to-view-cancelled-invitations' of https://github.com/cisagov/manage.get.gov into meoward/1604-allow-analysts-to-view-cancelled-invitations	2024-11-18 15:38:12 -05:00
asaki222	443c200f91	updated text	2024-11-18 15:37:56 -05:00
asaki222	a43668a4b9	Update src/registrar/views/domain.py ... Co-authored-by: Matt-Spence <matthewswSpence@gmail.com>	2024-11-18 15:37:26 -05:00
asaki222	f8e404860e	Update src/registrar/models/domain_invitation.py ... Co-authored-by: Matt-Spence <matthewswSpence@gmail.com>	2024-11-18 15:34:06 -05:00
Rachid Mrad	5d1e8e6e84	wip	2024-11-18 14:25:59 -05:00
asaki222	aa18afc9e1	made changes for the linter	2024-11-18 14:17:58 -05:00
David Kennedy	6a0c483288	formatted code for readability	2024-11-18 14:11:30 -05:00
David Kennedy	ddb7ed2d6c	added logic to not display blue info box in certain condition, and added test	2024-11-18 13:59:20 -05:00
asaki222	2a228054cf	updated for merge conflicts	2024-11-18 13:43:37 -05:00
asaki222	d6ee1d4242	updates	2024-11-18 13:10:48 -05:00
asaki222	fdbac80a31	Merge branch 'ad/1604-allow-analysts-to-view-cancelled-invitations' of https://github.com/cisagov/manage.get.gov into meoward/1604-allow-analysts-to-view-cancelled-invitations	2024-11-18 12:53:02 -05:00
asaki222	96a129da9e	Merge branch 'main' into ad/1604-allow-analysts-to-view-cancelled-invitations	2024-11-18 12:49:47 -05:00
asaki222	94b3651623	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into meoward/1604-allow-analysts-to-view-cancelled-invitations	2024-11-18 12:48:33 -05:00
asaki222	fdbcd99bfe	add error	2024-11-18 12:43:10 -05:00
dave-kennedy-ecs	7c5b56d7b3	Merge pull request #3078 from cisagov/bob/2728-domain-manager-page-updates ... #2728: domain manager page updates	2024-11-18 12:32:52 -05:00
David Kennedy	9c671c0f71	fixed outstanding copy, and updated comment	2024-11-18 12:27:05 -05:00