5346 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
zandercymatics	3b652cda6c	Merge branch 'main' into za/1852-user-contact-info-inline	2024-03-25 08:24:52 -06:00
zandercymatics	35ffdc7bd0	Merge pull request #1899 from cisagov/za/1864-error-message-rejection-placement ... (on getgov-za) Ticket #1864: Move error message for rejection reason required	2024-03-25 08:07:51 -06:00
Rebecca Hsieh	69bb18a6a6	Update migrations to most recent	2024-03-22 15:23:14 -07:00
Rebecca Hsieh	aeede26568	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/1896-federal-agency	2024-03-22 15:17:14 -07:00
Rachid Mrad	7bb3439c3e	Merge pull request #1871 from cisagov/bem-documentation ... Update documentation on CSS BEM naming	2024-03-22 18:11:19 -04:00
Rachid Mrad	cd52ec690a	copyedits	2024-03-22 18:10:42 -04:00
Rachid Mrad	a053d51292	copyedits	2024-03-22 18:10:03 -04:00
Rachid Mrad	f73ff0b971	edits	2024-03-22 18:08:52 -04:00
Rachid Mrad	cc90e8068b	Update docs/developer/README.md ... Co-authored-by: Alysia Broddrick <109625347+abroddrick@users.noreply.github.com>	2024-03-22 18:07:22 -04:00
Rachid Mrad	59c8625102	Merge pull request #1916 from cisagov/rjm/1814-401 ... Issue #1814: Enhance state mismatch error handling and messaging	2024-03-22 18:05:30 -04:00
Rachid Mrad	184b139f17	Merge pull request #1931 from cisagov/rjm/1910-generic-org-type ... Issue #1910: Change organization_type to generic_org_type	2024-03-22 18:04:09 -04:00
Erin	b74dbcbcd4	Add bulk_create to add federal agencies	2024-03-22 14:33:26 -07:00
Rebecca Hsieh	969909895c	Linter	2024-03-21 17:13:51 -07:00
Rebecca Hsieh	690cfafc99	Update migrations to main	2024-03-21 17:09:14 -07:00
Rebecca Hsieh	6daeeeae81	Merge branch 'main' of https://github.com/cisagov/manage.get.gov into rh/1896-federal-agency	2024-03-21 16:48:03 -07:00
Rebecca Hsieh	be1f6558d0	Remove our migrations to fix main	2024-03-21 16:47:23 -07:00
Rebecca Hsieh	14fb918719	Update function description, and remove unecessary save and logger	2024-03-21 16:12:34 -07:00
Rachid Mrad	4fe6b83f29	Fix paginator row overwrite bug	2024-03-21 18:22:49 -04:00
zandercymatics	98d940386b	New test cases	2024-03-21 13:45:06 -06:00
David Kennedy	6f4febde43	reformatted for readability (and to satisfy the linter)	2024-03-21 15:20:07 -04:00
David Kennedy	100e3cf300	test case written	2024-03-21 15:09:02 -04:00
zandercymatics	ed36fc6e3b	Code simplification	2024-03-21 12:42:21 -06:00
David Kennedy	1179a6a6b7	Cancel removed from retrieved invitations, cancel attempts on retrieved invitations errors	2024-03-21 13:57:24 -04:00
zandercymatics	de23820298	Update admin.py	2024-03-21 09:09:46 -06:00
zandercymatics	a6aa8b8578	Fix bug	2024-03-21 09:03:48 -06:00
zandercymatics	8f00ed4c45	Merge branch 'main' into za/1864-error-message-rejection-placement	2024-03-21 08:48:03 -06:00
zandercymatics	8a05dcad7c	Update admin.py	2024-03-21 08:47:57 -06:00
zandercymatics	c12b09a0ed	Update _admin.scss	2024-03-21 08:46:36 -06:00
Rachid Mrad	2636ef1b4e	Merge remote-tracking branch 'origin/main' into rjm/1910-generic-org-type	2024-03-20 17:44:38 -04:00
Rachid Mrad	c99b9adc15	merge main	2024-03-20 17:43:54 -04:00
Rachid Mrad	cb9808594f	change organization_type to generic_org_type	2024-03-20 17:33:55 -04:00
CocoByte	340811ac25	Merge remote-tracking branch 'origin/main' into nl/1798-update-email-signature	2024-03-20 15:27:47 -06:00
CuriousX	4c234158e1	Merge pull request #1877 from cisagov/nl/1106-fix-required-flag-on-public-contact-fields ... Issue # 1106 - fix "required field" flag on public contact fields	2024-03-20 15:24:47 -06:00
zandercymatics	7e8f07439e	Move order	2024-03-20 15:21:19 -06:00
zandercymatics	407ff0cb76	missing unit test	2024-03-20 13:13:56 -06:00
zandercymatics	516415d806	Correct new lines	2024-03-20 12:44:21 -06:00
zandercymatics	bdc03c66a9	Final unit test	2024-03-20 12:33:28 -06:00
zandercymatics	4830f5630f	Add unit tests + linting	2024-03-20 12:11:11 -06:00
zandercymatics	b8b97245a4	More tests	2024-03-20 11:47:06 -06:00
zandercymatics	54603cbfad	Unit tests, refactoring	2024-03-20 11:02:25 -06:00
Rebecca Hsieh	e55c0c72e7	Remove contenttype	2024-03-20 09:37:10 -07:00
Rebecca Hsieh	62b405959a	Add in permissions migration for federal agency	2024-03-20 09:33:11 -07:00
Rachid Mrad	d2c6a2df8b	change StateMismatch to inherit AuthenticationFailed	2024-03-20 12:29:12 -04:00
zandercymatics	e0aa729133	Fix merge conflicts	2024-03-20 09:11:51 -06:00
zandercymatics	fb6b8838d3	Merge branch 'main' into za/1864-error-message-rejection-placement	2024-03-20 08:18:27 -06:00
zandercymatics	ee66b234cf	Merge branch 'main' into za/1852-user-contact-info-inline	2024-03-20 08:15:08 -06:00
Rebecca Hsieh	c4c1fd602c	Remove todos	2024-03-19 15:34:30 -07:00
Erin	d0826fe847	Update tests to reflect federal agency text occurrences	2024-03-19 15:21:11 -07:00
Erin	601ded68ac	Fix lint errors	2024-03-19 15:19:44 -07:00
Erin	166ccbf5ea	Resolve merge conflict	2024-03-19 15:10:43 -07:00