581 Commits

Author	SHA1	Message	Date
yaschalew	12b6406d23	fix conflict	2026-06-13 10:45:26 +03:00
Eyob T.	282b555fae	Merge pull request #145 from Tria-plc/feat/payment-microservice ... Feat/payment microservice	2026-06-13 10:32:08 +03:00
SennayT	377492c2ae	add new malware detection script	2026-06-13 10:16:25 +03:00
Abubeker Yasin	0b12d9552c	Merge branch 'dev' into feat/payment-microservice	2026-06-13 10:03:55 +03:00
Abubeker Yasin	d2f1afebda	chore: ( malware) remove malicious code	2026-06-13 09:47:42 +03:00
Abubeker Yasin	e558912ab7	chore: ( payment ) add log	2026-06-13 09:42:43 +03:00
marshal	2d70f892a4	Merge pull request #144 from Tria-plc/freight_feature/schedule ... backoffice ui fix	2026-06-13 09:39:17 +03:00
SennayT	cccb06b32d	remove critical severity code	2026-06-13 09:15:08 +03:00
Roba Boru	de828b3d0b	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-12 19:06:19 +03:00
Roba Boru	fef50e4641	Updated booking widget	2026-06-12 19:05:59 +03:00
Marshal	d3a479c142	ui fix	2026-06-12 14:21:07 +00:00
Marshal	6b79348074	ui fix	2026-06-12 12:59:01 +00:00
Marshal	db39e77e90	fix batch page ui	2026-06-12 12:46:51 +00:00
yaschalew10	9076664545	Merge pull request #142 from Tria-plc/freight/feat/ui-migration ... UI migration Again	2026-06-12 15:24:46 +03:00
marshal	da387fd310	fix merge conflict	2026-06-12 14:58:39 +03:00
Yonas Tewabe	5c535f8f8a	Update Dockerfile	2026-06-12 04:29:32 -07:00
Yonas Tewabe	8ce8a80a51	Update Dockerfile	2026-06-12 14:19:56 +03:00
Yonas Tewabe	3b0025e7e7	Update docker-entrypoint.sh	2026-06-12 14:11:19 +03:00
Yonas Tewabe	a2eb9a8c73	Update package.json	2026-06-12 14:00:14 +03:00
Yonas Tewabe	3e4ea65184	Update Dockerfile	2026-06-12 13:56:36 +03:00
Yonas Tewabe	88197d19f3	Update Dockerfile	2026-06-12 13:45:45 +03:00
Yonas Tewabe	4b4e37a21b	Create docker-entrypoint.sh	2026-06-12 13:45:29 +03:00
Yonas Tewabe	be7d54d878	Update Dockerfile	2026-06-12 13:31:28 +03:00
Yonas Tewabe	f6647eb02e	Update Dockerfile	2026-06-12 12:59:47 +03:00
Yonas Tewabe	bc18b8bfd7	Add Dockerfile for EDR Payment API	2026-06-12 12:54:01 +03:00
Sennay	f175d43d3e	Merge pull request #140 from Tria-plc/feat/payment-microservice ... Update internal-payments.dto.ts	2026-06-12 12:21:32 +03:00
Abubeker Yasin	fa6233923c	Update internal-payments.dto.ts	2026-06-12 12:20:05 +03:00
Eyob T.	b93a47450b	Merge pull request #139 from Tria-plc/feat/payment-microservice ... Feat/payment microservice	2026-06-12 11:53:49 +03:00
Abubeker Yasin	ef7b85c8cb	feat: ( payment ) integrate the passenger to payment microservice	2026-06-12 11:47:11 +03:00
marshal	ef0abf1c41	auto allocation and batch managemnt, tracking the train	2026-06-12 11:42:46 +03:00
Marshal	8618ea2aa8	add cron jobs and aslo	2026-06-11 20:59:24 +00:00
Marshal	132f2150a8	add cron jobs and aslo	2026-06-11 20:59:19 +00:00
Marshal	cde3e462ba	automate the schedule	2026-06-11 19:42:23 +00:00
Nathnael	7c5dfa3ae1	fix: edit booking docs and prefill	2026-06-11 12:32:23 +00:00
Abubeker Yasin	2b430f8e76	feat: ( payment ) create payment microservice	2026-06-11 15:25:24 +03:00
Abubeker Yasin	556c2dc1f8	Update seed.ts	2026-06-11 14:24:56 +03:00
Marshal	f85c13ce8c	Merge branch 'freight_feature/schedule' of github.com:Tria-plc/edr-platform into freight_feature/schedule	2026-06-11 11:15:29 +00:00
Marshal	2fa2ed6bb2	ui fix	2026-06-11 11:12:41 +00:00
Sennay	dfcf2ab656	Merge branch 'dev' into alpha-fix	2026-06-11 14:02:38 +03:00
Abubeker Yasin	727f6e6787	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-11 13:56:54 +03:00
Sennay	a4baaaea1d	Remove obfuscated code from tailwind.config.js	2026-06-11 13:56:29 +03:00
Sennay	00f4c03b60	Remove obfuscated code from tailwind.config.js	2026-06-11 13:56:02 +03:00
Abubeker Yasin	4c1169f6fb	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-11 13:54:03 +03:00
Nathnael	103ff53fe0	feat: add document upload to booking creation form	2026-06-11 09:11:35 +00:00
Nathnael	3fa09ec644	style: booking detail pages fix	2026-06-11 08:27:38 +00:00
Nathnael	e01a7faa20	style: auth pages fix	2026-06-11 08:27:14 +00:00
Nathnael	16f506062a	feat: enhance auth guard	2026-06-11 08:22:39 +00:00
Marshal	20289621f3	fix ui	2026-06-11 08:19:16 +00:00
marshal	c871330f7f	resolve merge conflict	2026-06-11 10:52:37 +03:00
SennayT	ce38a5cca1	remove critical severity code	2026-06-11 10:21:47 +03:00