Feature/settings page #17

Closed

mattdimegs wants to merge 26 commits from feature/settings-page into main

pull from: feature/settings-page

merge into: Doble:main

Doble:main

Doble:john4064/Scalar/Install

Doble:refactor/update-med-calls

Doble:test-deploy

Doble:Dev

Doble:bugfix/parsing-issue

Conversation 0 Commits 26 Files changed 13 +4654 -656

26 commits

Author	SHA1	Message	Date
Matt DiMeglio	3a23f60488	Merge branch 'main' into feature/settings-page	2026-02-07 12:04:11 -05:00
Matt DiMeglio	40db6ec877	Merge branch 'feature/settings-page' of https://github.com/Doble-Technologies/ShiftSync-Website into feature/settings-page	2025-12-01 22:55:55 -05:00
Matt DiMeglio	941110abc1	Settings add	2025-12-01 22:55:54 -05:00
Matt DiMeglio	4ba9e91eee	Update	2025-08-09 15:49:15 -04:00
Matt DiMeglio	a0bb4bef4a	Init API Side	2025-06-23 17:55:42 -04:00
Matt DiMeglio	16eb49d41e	Merge branch 'main' into feature/settings-page	2025-06-15 22:32:05 -04:00
Matt DiMeglio	bb8a672b98	Merge branch 'main' into feature/settings-page	2025-06-12 16:33:18 -04:00
Matt DiMeglio	6389eb8d6b	Merge branch 'main' into feature/settings-page	2025-06-12 16:25:53 -04:00
Matt DiMeglio	4e49222e2b	Merge branch 'main' into feature/settings-page	2025-06-12 16:24:08 -04:00
Matt DiMeglio	3d274363e7	Merge branch 'main' into feature/settings-page	2025-06-12 16:23:11 -04:00
Matt DiMeglio	ec58d344dc	Merge branch 'main' into feature/settings-page	2025-06-12 16:19:20 -04:00
Matt DiMeglio	e60de19e02	Merge branch 'main' into feature/settings-page	2025-06-12 16:18:22 -04:00
Matt DiMeglio	6806cdabfb	Merge branch 'main' into feature/settings-page	2025-06-12 16:16:04 -04:00
Matt DiMeglio	79c3acb6be	Merge branch 'main' into feature/settings-page	2025-06-12 16:12:27 -04:00
Matt DiMeglio	0010ba3a4f	Merge branch 'main' into feature/settings-page	2025-06-12 16:09:27 -04:00
Matt DiMeglio	1b7d1e54e2	Merge branch 'main' into feature/settings-page	2025-06-12 16:07:48 -04:00
Matt DiMeglio	1d00dd528f	Remove Echo	2025-06-12 15:44:30 -04:00
Matt DiMeglio	b0670cc3a3	Update Settings.jsx	2025-06-12 15:41:28 -04:00
Matt DiMeglio	f4766ed7e1	Merge branch 'main' into feature/settings-page	2025-06-12 15:41:24 -04:00
John Parkhurst	bdfe409891	Integrity 1	2025-06-11 10:53:22 -04:00
John Parkhurst	20c088e9e7	Update Dockerfile	2025-06-11 10:42:19 -04:00
John Parkhurst	375059e3ee	Update Dockerfile	2025-06-11 10:39:55 -04:00
John Parkhurst	21ac649bba	Merge branch 'main' into feature/settings-page	2025-06-11 10:22:36 -04:00
John Parkhurst	3a7a6d3e2c	Update package.json	2025-06-11 10:22:31 -04:00
John Parkhurst	fa56c3a785	Update docker-compose.yaml	2025-06-10 23:17:33 -04:00
John Parkhurst	49c5e4026c	Update docker-compose.yaml	2025-06-10 23:10:05 -04:00