96 Commits

Author	SHA1	Message	Date
Roba Boru	2c33ce44bf	Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-17 16:54:37 +03:00
Yonas Tewabe	276c229cd4	Fix missing newline at end of tailwind.config.js ... Add missing newline at the end of tailwind.config.js	2026-06-17 16:51:13 +03:00
Yonas Tewabe	9d59ecb29a	Update tailwind.config.js	2026-06-17 16:50:44 +03:00
Roba Boru	b5abe79294	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-17 16:50:41 +03:00
Roba Boru	2bfce8beb1	Update booking summary page layout and update notification service	2026-06-17 16:49:05 +03:00
Stephanos A	a6fc8e3eb6	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-17 15:52:29 +03:00
Roba Boru	d67f4a8358	Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-17 15:18:26 +03:00
Roba Boru	a304ed2f03	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-17 15:07:38 +03:00
Roba Boru	1d34354e66	Update booking result page for round trip	2026-06-17 15:07:05 +03:00
Yonas Tewabe	1ad1999b2f	Update tailwind.config.js	2026-06-17 14:53:45 +03:00
Yonas Tewabe	3e618c8f71	Update tailwind.config.js	2026-06-17 14:52:59 +03:00
Yonas Tewabe	999a58011c	Update deploy.yml	2026-06-17 04:00:10 -07:00
Stephanos A	24ee3b88f5	Round trip booking and additional enhancements	2026-06-17 13:42:20 +03:00
Roba Boru	ad2a175ff5	Merge remove changes	2026-06-16 22:29:50 +03:00
Roba Boru	57c2549738	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-16 22:29:31 +03:00
Roba Boru	001a1a7d98	Update roundtrip booking result	2026-06-16 22:29:10 +03:00
Eyob T.	fc57c66d0a	Merge pull request #185 from Tria-plc/alpha ... Merge request for booking endpoint and other enhancements	2026-06-16 20:20:41 +03:00
Stephanos A	ad83c87e2f	Enhance deletion logic in Fleet and Schedules services to prevent deletion of records with active dependencies; update Seats and Stations pages to improve UI and remove unused fields.	2026-06-16 19:30:09 +03:00
Eyob T.	2e9e69275a	Merge pull request #180 from Tria-plc/alpha ... Enhance DTOs and services to support sequence and operational status for coaches and stations	2026-06-16 17:40:01 +03:00
Stephanos A	421e30dc6c	Enhance DTOs and services to support sequence and operational status for coaches and stations	2026-06-16 16:25:33 +03:00
Nathnael Wondisha	b82e4ac46e	Merge branch 'dev' into freight/develop	2026-06-16 16:22:38 +03:00
Stephanos A	e03c11e7ee	Build issues resolution	2026-06-16 14:41:27 +03:00
Stephanos A	fc5f77c817	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-16 14:40:09 +03:00
Stephanos A	75c8423f50	Round trip journeys, feedback items, backoffice documentation	2026-06-16 13:33:03 +03:00
Roba Boru	ed49470249	Update telebirr callback page query paramaters	2026-06-16 12:14:10 +03:00
Roba Boru	03c4ec33c3	Added get ticketing info by reference number endpoint and update payment methods to dynamic	2026-06-16 09:47:05 +03:00
Eyob T.	20d6b1b6d8	Security patch	2026-06-15 14:11:39 +03:00
Stephanos A	9ed3831c2a	Nationality mismatch issue resolution	2026-06-14 23:36:23 +03:00
Roba Boru	4a0773e1a5	Revert payment page	2026-06-14 20:40:54 +03:00
Roba Boru	13e7fbbab0	Update home page and fix build error	2026-06-14 20:28:10 +03:00
Roba Boru	b5ed10beaa	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-14 20:01:29 +03:00
Stephanos A	9c7f42982f	Lockfile and lint issues resolution	2026-06-14 15:29:37 +03:00
Roba Boru	a9f8f0c43c	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-14 11:08:07 +03:00
Roba Boru	faf0eeb3b6	Update get payment methods from static to api	2026-06-14 11:07:29 +03:00
Stephanos A	c475c7e89f	Cleaned tailwind.config.js files	2026-06-14 10:38:13 +03:00
Stephanos A	1cd0a55305	Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha	2026-06-14 10:31:27 +03:00
Stephanos A	20d483ed00	Backoffice portal updates: dashboard, seat management, pricing, audit logging, reporting	2026-06-14 10:26:22 +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
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
Yonas Tewabe	5c535f8f8a	Update Dockerfile	2026-06-12 04:29:32 -07:00
Sennay	dfcf2ab656	Merge branch 'dev' into alpha-fix	2026-06-11 14:02:38 +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
SennayT	ce38a5cca1	remove critical severity code	2026-06-11 10:21:47 +03:00
Eyob T.	d53e9eba07	Merge pull request #133 from Tria-plc/alpha	2026-06-10 09:14:08 -07:00