7038 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Rachid Mrad	421141804d	Merge pull request #2105 from cisagov/staging-74-hotfix-gulp-new ... Staging hotfix for gulp issue	2024-04-30 18:37:42 -04:00
Rachid Mrad	e5e4660f4d	Merge branch 'main' into staging-74-hotfix-gulp-new	2024-04-30 18:34:45 -04:00
Rebecca Hsieh	b75ae04812	Staging hotfix for gulp issue	2024-04-30 15:02:17 -07:00
zandercymatics	f6c154c94b	Refactor tests	2024-04-30 14:58:46 -06:00
Rachid Mrad	05da5f98ee	Merge pull request #2071 from cisagov/rjm/2070-auditlog-update-2 ... Issue #2051: Update auditlog - (No sandbox)	2024-04-30 16:53:17 -04:00
Erin	41b13e5645	Revert U.S. China duplicate for later ticket	2024-04-30 12:12:43 -07:00
zandercymatics	8dc48d21f4	Add documentation	2024-04-30 13:07:26 -06:00
Erin	e16f5b6598	Enable updates to FederalAgency	2024-04-30 11:49:04 -07:00
zandercymatics	9119339203	Fix fixtures	2024-04-30 12:35:30 -06:00
zandercymatics	74978ba5ba	Cleanup	2024-04-30 12:26:46 -06:00
Rebecca Hsieh	053bfc8822	Remove us china federal agency	2024-04-30 10:35:19 -07:00
Rachid Mrad	7160efa515	comment	2024-04-30 13:30:26 -04:00
Rachid Mrad	c6b6c17540	revise logic a bit to ensure user and contact do not overwrite each other	2024-04-30 13:28:03 -04:00
zandercymatics	91545f45be	Add waffle flags to migrations	2024-04-30 11:22:25 -06:00
zandercymatics	5e2ec5d1c8	Migrations, etc	2024-04-30 10:52:53 -06:00
zandercymatics	f52a7e08fe	Add basic flag	2024-04-30 09:28:11 -06:00
zandercymatics	97d71246d9	Merge branch 'main' into za/2054-waffle-feature-flags	2024-04-30 08:57:28 -06:00
zandercymatics	d1e558640e	Add waffle and cffi	2024-04-30 08:57:18 -06:00
zandercymatics	363fc0548d	Update get-gov-admin.js	2024-04-30 08:37:43 -06:00
zandercymatics	98964f2d27	Merge branch 'main' into za/1998-add-table-descriptions	2024-04-30 08:28:39 -06:00
zandercymatics	a1c5b48f03	Merge branch 'main' into bob/1949-multi-selects-accessibility	2024-04-30 08:24:10 -06:00
zandercymatics	7078362fe6	Merge branch 'main' into za/1998-add-table-descriptions	2024-04-30 08:17:44 -06:00
zandercymatics	38331f191b	Merge pull request #2061 from cisagov/za/1851-check-how-user-was-verified ... (on getgov-za) Ticket #1851: Show how a user was verified	2024-04-30 08:13:47 -06:00
zandercymatics	99db3b1da7	Merge branch 'main' into za/1851-check-how-user-was-verified	2024-04-30 08:08:10 -06:00
Rachid Mrad	8b36fef5c1	If phone number is already filled in for the associated contact, do not overwrite	2024-04-29 19:41:51 -04:00
Erin	00b99d8786	Resolve merge conflicts	2024-04-29 15:50:48 -07:00
Erin	7086884c95	Change not checks to is None	2024-04-29 15:48:46 -07:00
Rachid Mrad	781b9f7b81	if phone number is already filled in on user, do not overwrite	2024-04-29 18:39:00 -04:00
Alysia Broddrick	4fcec5819c	Merge pull request #2090 from cisagov/za/use-node-nightly ... Ticket #2075: Dev builds failing due to vinyl-fs	2024-04-29 15:32:40 -07:00
zandercymatics	51c1baf0e0	Update node.Dockerfile	2024-04-29 14:35:11 -06:00
zandercymatics	7848a6e6e5	Add bash script for each yaml	2024-04-29 14:33:48 -06:00
zandercymatics	140735a793	Remove setup node.js	2024-04-29 14:28:32 -06:00
zandercymatics	4c6e555a05	Run nvm inside of docker shell	2024-04-29 14:21:24 -06:00
zandercymatics	75f3a1cca1	Try nvm	2024-04-29 14:19:40 -06:00
zandercymatics	40795f2e47	Force install node version	2024-04-29 14:07:22 -06:00
zandercymatics	6e06779c30	Update deploy-sandbox.yaml	2024-04-29 14:05:20 -06:00
zandercymatics	596afdb6de	Add cache dependency path	2024-04-29 13:57:20 -06:00
zandercymatics	65635dc8e3	Update deploy-sandbox.yaml	2024-04-29 13:55:47 -06:00
zandercymatics	1d58ead3e1	Update deploy-sandbox.yaml	2024-04-29 13:55:21 -06:00
zandercymatics	ad72c49de7	Update deploy-sandbox.yaml	2024-04-29 13:55:13 -06:00
zandercymatics	3965c7d199	Update deploy-sandbox.yaml	2024-04-29 13:46:36 -06:00
zandercymatics	0e66070e85	Update deploy-sandbox.yaml	2024-04-29 13:44:44 -06:00
zandercymatics	bb24f72355	Update deploy-sandbox.yaml	2024-04-29 13:43:59 -06:00
zandercymatics	708c53b8cb	Add correct spacing	2024-04-29 13:38:44 -06:00
zandercymatics	9ca48c06d9	Update deploy-sandbox.yaml	2024-04-29 13:38:00 -06:00
zandercymatics	1313527b9d	Remove cache	2024-04-29 13:36:22 -06:00
zandercymatics	e663dee659	Update deploy-sandbox.yaml	2024-04-29 13:35:58 -06:00
zandercymatics	66558ae80c	Update deploy-sandbox.yaml	2024-04-29 13:34:00 -06:00
zandercymatics	04080d85f3	Use correct node version	2024-04-29 13:28:27 -06:00
zandercymatics	3865d8440c	Update deploy-sandbox.yaml	2024-04-29 13:23:09 -06:00