Yonas Tewabe
d0689dfe04
Update deploy.yml
2026-06-16 10:23:51 +03:00
Yonas Tewabe
f52fc44ca1
Update deploy.yml
2026-06-16 10:21:57 +03:00
Yonas Tewabe
c267d4f641
Enhance deployment workflow with change detection
...
Added a job to detect changed services and conditionally deploy based on changes. Updated deployment strategy to handle service-specific environment files.
2026-06-16 10:18:32 +03:00
Abubeker Yasin
f3d892f68e
Merge pull request #164 from Tria-plc/feat/payment-microservice
...
fix: ( telebirr ) redirect_url
2026-06-15 22:06:28 +03:00
Abubeker Yasin
96ec2923c2
fix: ( telebirr ) redirect_url
2026-06-15 14:35:14 +03:00
Yonas Tewabe
3e3daba14d
Update deploy.yml
2026-06-15 13:43:48 +03:00
Abubeker Yasin
e4805824ce
Merge pull request #162 from Tria-plc/feat/payment-microservice
...
Update payments.service.ts
2026-06-15 11:28:05 +03:00
Abubeker Yasin
73eeee175f
Update payments.service.ts
2026-06-15 11:26:51 +03:00
Eyob T.
a957c97960
Merge pull request #159 from Tria-plc/alpha
...
Merge request for nationality mismatch issue resolution
2026-06-14 23:53:29 +03:00
Stephanos A
9ed3831c2a
Nationality mismatch issue resolution
2026-06-14 23:36:23 +03:00
Stephanos A.
513f6bffc1
Merge pull request #158 from Tria-plc/dev
...
Pull updates from dev to alpha
2026-06-14 23:06:21 +03:00
Abubeker Yasin
3a9f0dd0a8
Merge pull request #157 from Tria-plc/feat/payment-microservice
...
Revert "refactor: ( rabbitmq ) temporary remove the rabbitmq"
2026-06-14 21:55:15 +03:00
Abubeker Yasin
4ab987e8fe
Revert "refactor: ( rabbitmq ) temporary remove the rabbitmq"
...
This reverts commit 3b961f17f5
2026-06-14 21:44:36 +03:00
Eyob T.
74e3791ab6
Merge pull request #156 from Tria-plc/alpha
...
Update portal home and fix build error
2026-06-14 20:48:04 +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
5219c7a79c
Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha
2026-06-14 20:02:04 +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
Abubeker Yasin
b7cc05a631
Merge pull request #155 from Tria-plc/feat/payment-microservice
...
refactor: ( rabbitmq ) temporary remove the rabbitmq
2026-06-14 18:48:53 +03:00
Abubeker Yasin
3b961f17f5
refactor: ( rabbitmq ) temporary remove the rabbitmq
2026-06-14 18:47:41 +03:00
Eyob T.
39e32f4e0a
Merge pull request #154 from Tria-plc/alpha
...
Merge request for lock file and lint issues resolution
2026-06-14 15:36:39 +03:00
Stephanos A
9c7f42982f
Lockfile and lint issues resolution
2026-06-14 15:29:37 +03:00
Eyob T.
d6247e0e2b
Merge pull request #148 from Tria-plc/feat/payment-microservice
...
refactor: ( payment ) use rabbitmq for webhooks event
2026-06-14 15:24:25 +03:00
Stephanos A.
d8a762f287
Merge pull request #153 from Tria-plc/dev
...
Merge pull request #152 from Tria-plc/alpha
2026-06-14 15:14:28 +03:00
Eyob T.
2b2897ab90
Merge pull request #152 from Tria-plc/alpha
...
Merge request for passenger back office updates
2026-06-14 13:37:42 +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
f8701eacfb
Merge branch 'dev' into alpha
2026-06-14 10:47:51 +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
Abubeker Yasin
2b90e793c3
Merge branch 'dev' into feat/payment-microservice
2026-06-13 20:45:04 +03:00
Abubeker Yasin
c35b5089ce
refactor: ( payment ) use rabbitmq for webhooks event
2026-06-13 20:19:23 +03:00
Yonas Tewabe
a1f493d12c
Update docker-compose.yaml
2026-06-13 12:05:29 +03:00
Abubeker Yasin
962ef17803
Merge pull request #146 from Tria-plc/feat/payment-microservice
...
Update payment-client.service.ts
2026-06-13 10:49:10 +03:00
Abubeker Yasin
eb94d58a4e
Update payment-client.service.ts
2026-06-13 10:48:19 +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
b6ece3dd6f
Add scan report
2026-06-13 10:27:37 +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
SennayT
cccb06b32d
remove critical severity code
2026-06-13 09:15:08 +03:00
Sennay
4b7a5990d7
Update .gitignore to remove malicious entries
...
Remove temporary files from .gitignore
2026-06-13 09:13:39 +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
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
