208 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ImanThiyanga	9a124c8c63	Merge pull request 'fixed ci-cd' (#76) from Dev into production ... Reviewed-on: #76	2026-09-18 19:05:55 +00:00
ImanThiyanga	42ab7e5964	Merge branch 'production' into Dev	2026-09-18 19:05:48 +00:00
ImanThiyanga	e7735135ca	fixed ci-cd	2026-09-19 00:35:05 +05:30
ImanThiyanga	f61d1f95b8	Merge pull request 'Dev' (#75) from Dev into production ... Reviewed-on: #75	2026-09-18 18:54:54 +00:00
ImanThiyanga	f632c5fc99	Merge branch 'production' into Dev	2026-09-18 18:54:46 +00:00
ImanThiyanga	70179e1abc	Merge pull request 'new updates' (#74) from new-updates into Dev ... Reviewed-on: #74	2026-09-18 18:53:13 +00:00
Sasanka	8c3d62223c	new updates	2026-09-19 00:22:53 +05:30
ImanThiyanga	e1f19fe413	Merge pull request 'Add backup images for login and background removal' (#73) from UI into Dev ... Reviewed-on: #73	2026-09-18 18:43:33 +00:00
Naveen	cb6b92d221	Add backup images for login and background removal ... - Added loginerps.png.bak (1134 KB) as a backup for the login image. - Added whithoutbackground.png.bak (3455 KB) as a backup for the image without background.	2026-09-19 00:12:41 +05:30
ImanThiyanga	3f10ae3bca	changes fix for production	2026-09-19 00:00:42 +05:30
ImanThiyanga	7274b89b28	Merge pull request 'migrations fix' (#72) from Dev into production ... Reviewed-on: #72	2026-09-18 18:23:44 +00:00
ImanThiyanga	61fe1a0e0c	Merge branch 'production' into Dev	2026-09-18 18:23:35 +00:00
ImanThiyanga	941f20d4c5	migrations fix	2026-09-18 23:52:26 +05:30
kalana_Thilakarathna	b06d20e649	Merge pull request 'test to yml' (#71) from Dev into production ... Reviewed-on: #71	2026-09-18 05:23:55 +00:00
Kalana B. Thilakarathna	445d323bed	test to yml	2026-09-18 10:52:17 +05:30
kalana_Thilakarathna	9028255800	Merge pull request 'workflowupdate' (#70) from Dev into production ... Reviewed-on: #70	2026-09-18 04:51:58 +00:00
Kalana B. Thilakarathna	1b2f244853	workflowupdate	2026-09-18 10:21:36 +05:30
kalana_Thilakarathna	475bcfec1a	Merge pull request 'pipeline update' (#69) from Dev into production ... Reviewed-on: #69	2026-09-18 04:48:49 +00:00
Kalana B. Thilakarathna	85db26ec82	pipeline update	2026-09-18 10:18:13 +05:30
kalana_Thilakarathna	baee987d26	Merge pull request 'test' (#68) from Dev into production ... Reviewed-on: #68	2026-09-17 08:25:31 +00:00
Kalana B. Thilakarathna	f45a59f20d	test	2026-09-17 13:55:06 +05:30
kalana_Thilakarathna	32304cbaff	Merge pull request 'user fix at workflow' (#67) from Dev into production ... Reviewed-on: #67	2026-09-17 07:35:02 +00:00
Kalana B. Thilakarathna	2b64bb0ebc	user fix at workflow	2026-09-17 13:04:15 +05:30
kalana_Thilakarathna	ffe5251236	Merge pull request 'workflow fix' (#66) from Dev into production ... Reviewed-on: #66	2026-09-17 07:26:14 +00:00
Kalana B. Thilakarathna	d04a7fb3bc	workflow fix	2026-09-17 12:55:38 +05:30
kalana_Thilakarathna	d76595085e	Merge pull request 'workflow fix' (#65) from Dev into production ... Reviewed-on: #65	2026-09-17 07:08:22 +00:00
Kalana B. Thilakarathna	bad33a8492	workflow fix	2026-09-17 12:38:05 +05:30
kalana_Thilakarathna	b0216fca30	Merge pull request 'triger erpo core workflow' (#64) from Dev into production ... Reviewed-on: #64	2026-09-17 07:07:24 +00:00
Kalana B. Thilakarathna	49c112d188	triger erpo core workflow	2026-09-17 12:37:04 +05:30
kalana_Thilakarathna	c836b57d54	Merge pull request 'gitea work flow update' (#63) from Dev into production ... Reviewed-on: #63	2026-09-17 07:06:02 +00:00
Kalana B. Thilakarathna	3a583f80e5	gitea work flow update	2026-09-17 12:28:31 +05:30
ImanThiyanga	83e0335504	Merge pull request 'Dev' (#62) from Dev into production ... Reviewed-on: #62	2026-09-17 05:58:25 +00:00
ImanThiyanga	513343b62a	Merge pull request 'Revert/ci cd merges' (#61) from revert/ci-cd-merges into Dev ... Reviewed-on: #61	2026-09-17 05:57:56 +00:00
ImanThiyanga	256e39ccff	Revert "Merge pull request 'Dev' (#58) from Dev into production" ... This reverts commit 821e96e011, reversing changes made to 0ff39e9e58.	2026-09-17 11:25:33 +05:30
ImanThiyanga	efb37fce7a	Revert "Merge pull request 'Dev' (#60) from Dev into production" ... This reverts commit 01fc2582b6, reversing changes made to 821e96e011.	2026-09-17 11:25:33 +05:30
ImanThiyanga	01fc2582b6	Merge pull request 'Dev' (#60) from Dev into production ... Reviewed-on: #60	2026-09-16 18:47:15 +00:00
ImanThiyanga	39a2dc60be	Merge pull request 'Feat/ci cd implementation' (#59) from feat/ci-cd-implementation into Dev ... Reviewed-on: #59	2026-09-16 18:30:42 +00:00
ImanThiyanga	3b87a6e421	Merge branch 'Dev' into feat/ci-cd-implementation	2026-09-16 18:30:22 +00:00
ImanThiyanga	2a7a44cc27	change in to merge	2026-09-16 23:48:07 +05:30
ImanThiyanga	c7cf63e7de	initiating connection fixes	2026-09-16 23:47:47 +05:30
ImanThiyanga	d1044e4728	final fix	2026-09-16 13:53:57 +05:30
ImanThiyanga	821e96e011	Merge pull request 'Dev' (#58) from Dev into production ... Reviewed-on: #58	2026-09-16 06:37:25 +00:00
ImanThiyanga	d6f973202d	Merge branch 'production' into Dev	2026-09-16 06:36:19 +00:00
ImanThiyanga	1d5a5cf68e	Merge pull request 'Feat/ci cd implementation' (#57) from feat/ci-cd-implementation into Dev ... Reviewed-on: #57	2026-09-16 06:24:55 +00:00
ImanThiyanga	8e472ac996	initialising for ci-cd pipeline	2026-09-16 11:53:55 +05:30
ImanThiyanga	666979cf22	initiated ci-cd pipeline for the erp core with fronend changes to detect changes on both front and back	2026-09-16 11:53:17 +05:30
ashan_rusiru	eb36e0acfa	Merge pull request 'Users and employees arrangements' (#56) from users-and-employees-arrangements into Dev ... Reviewed-on: #56	2026-09-14 05:23:25 +00:00
ashan_rusiru	0ff39e9e58	Merge pull request 'Users and employees arrangements' (#53) from users-and-employees-arrangements into production ... Reviewed-on: #53	2026-09-13 07:52:34 +00:00
ashan_rusiru	cbb610fc8b	Merge branch 'production' into users-and-employees-arrangements	2026-09-13 07:52:24 +00:00
ashan_rusiru	afa9928dcc	Merge pull request 'bug fixing' (#55) from bug-fixing into Dev ... Reviewed-on: #55	2026-09-13 07:52:06 +00:00