5879 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	438df069d6	WIP for new copy fields	2024-03-20 15:10:08 -06:00
zandercymatics	e7edf19897	Merge branch 'za/1852-user-contact-info-inline' into za/1848-copy-contact-email-to-clipboard	2024-03-20 14:39:02 -06:00
zandercymatics	76b05d9540	Merge branch 'main' into za/1848-copy-contact-email-to-clipboard	2024-03-20 14:36:55 -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
Erin	5a5faecb2a	Update test_migrations with federal agency permissions	2024-03-19 15:02:49 -07:00
Erin	664b3eb895	Add sorting to federal agency table	2024-03-19 14:51:48 -07:00
zandercymatics	a8c10816b8	Add links to urls	2024-03-19 15:49:32 -06:00
Erin	712bb26d03	Add search	2024-03-19 14:48:25 -07:00
Erin	d62e95fd10	Populate fed agency seed data	2024-03-19 14:40:36 -07:00
Rachid Mrad	3ea0d90853	lint	2024-03-19 16:51:38 -04:00
Rachid Mrad	e4c1b06f63	unit tests	2024-03-19 16:48:36 -04:00
zandercymatics	706275a1e4	Merge branch 'za/1852-user-contact-info-inline' into za/1848-copy-contact-email-to-clipboard	2024-03-19 14:08:26 -06:00
zandercymatics	9952d248f6	Update admin.py	2024-03-19 14:07:02 -06:00
zandercymatics	983f1bc00e	Update domain_request_detail_table.html	2024-03-19 14:06:00 -06:00
zandercymatics	7ea27e3aa2	Slight abstraction	2024-03-19 13:50:25 -06:00
zandercymatics	1841b2f728	Styling	2024-03-19 12:46:22 -06:00
zandercymatics	357ccf0b5b	Merge pull request #1915 from cisagov/za/1371-bulk-delete-error ... Ticket #1731: Bulk delete error	2024-03-19 11:56:13 -06:00
Erin	7b5beba813	Add initial federal agency model migration	2024-03-19 10:36:14 -07:00
zandercymatics	ee58eb9f47	Merge branch 'nl/1836-remove-dangerous-multiselects' into za/1852-user-contact-info-inline	2024-03-19 11:15:17 -06:00
zandercymatics	2ad571354e	Basics	2024-03-19 11:15:05 -06:00
Rachid Mrad	7a6bebac52	Merge pull request #1867 from cisagov/rjm/1789-metrics-report ... Issue #1789: Analytics dashboard	2024-03-19 13:05:05 -04:00
Rachid Mrad	4e1c2396c2	Fix css typo	2024-03-19 12:53:49 -04:00
Rachid Mrad	5be847e9bb	Fix css class name (BEM)	2024-03-19 12:20:29 -04:00
Rachid Mrad	592e1bee06	Merge branch 'rjm/1814-401' of https://github.com/cisagov/manage.get.gov into rjm/1814-401	2024-03-19 12:06:09 -04:00
Rachid Mrad	d04b54a9f9	fix typo	2024-03-19 12:04:46 -04:00
Rachid Mrad	6f8af3f5c3	attempt redirect_attempted pop from session in else clause	2024-03-19 12:03:13 -04:00
zandercymatics	a5d8a3d3bf	Merge branch 'main' into za/1848-copy-contact-email-to-clipboard	2024-03-19 09:26:10 -06:00
Alysia Broddrick	3a189c205c	Merge pull request #1925 from cisagov/ab/remove-test-code ... Remove unneeded test code	2024-03-19 08:20:19 -07:00