|
|
0ef4ead292
|
Merge branch 'Feature/reward/client-api' into Main
|
2026-01-13 11:30:51 +03:30 |
|
|
|
b286923dfe
|
Merge branch 'Feature/fine/client-api' into Main
# Conflicts:
# .gitignore
# ServiceHost/Program.cs
|
2026-01-13 11:30:45 +03:30 |
|
|
|
18867b4929
|
set workshopId for FineController.cs
|
2026-01-13 11:10:48 +03:30 |
|
|
|
a9df0669c6
|
add client api FineController.cs
|
2026-01-13 11:08:03 +03:30 |
|
|
|
5c75316f40
|
add fine api client controller
|
2026-01-13 10:50:53 +03:30 |
|
|
|
8839b54dd3
|
add client api RewardController.cs
|
2026-01-13 10:31:41 +03:30 |
|
gozareshgir
|
0d33d79620
|
unblock hangfire completed
|
2026-01-11 22:07:58 +03:30 |
|
gozareshgir
|
577fe5db76
|
Merge branch 'master' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into Feature/SmsRepoetApi
|
2026-01-11 12:58:36 +03:30 |
|
|
|
b6fde4903a
|
Merge branch 'Feature/institution-contract/sent-to-customer-flag'
|
2026-01-08 15:03:07 +03:30 |
|
SamSys
|
ec8333c715
|
merg from master
|
2026-01-08 15:00:40 +03:30 |
|
SamSys
|
5580d56874
|
change logger on program.cs
|
2026-01-08 14:14:27 +03:30 |
|
SamSys
|
423b49e6e7
|
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
|
2026-01-08 14:05:30 +03:30 |
|
|
|
43562fb49c
|
Merge branch 'Feature/program-manager/chat'
# Conflicts:
# .gitignore
# ServiceHost/appsettings.Development.json
# ServiceHost/appsettings.json
|
2026-01-08 13:51:06 +03:30 |
|
SamSys
|
5202779d9f
|
changes
|
2026-01-08 12:18:01 +03:30 |
|
|
|
c980354c6b
|
Merge branch 'Feature/program-manager/priority' into Main
|
2026-01-08 12:09:37 +03:30 |
|
|
|
22a5564ba0
|
Merge branch 'Feature/loan/client-api' into Main
|
2026-01-08 12:04:28 +03:30 |
|
|
|
ef49302f8a
|
feat: add workshop ID handling in LoanController for loan search filtering
|
2026-01-08 12:03:54 +03:30 |
|
|
|
d8d2c34de7
|
refactor: simplify Serilog configuration in Program.cs
|
2026-01-08 11:54:13 +03:30 |
|
SamSys
|
67a85735f0
|
merge from master
|
2026-01-08 11:36:18 +03:30 |
|
SamSys
|
bf46dfd1dc
|
Merge branch 'master' of https://github.com/samsyntax24/OriginalGozareshgir
|
2026-01-08 11:35:10 +03:30 |
|
SamSys
|
a1ed3ad648
|
logeer change
|
2026-01-08 11:35:03 +03:30 |
|
SamSys
|
e65852c829
|
change logger
|
2026-01-08 11:23:12 +03:30 |
|
|
|
6f076bdc77
|
feat: update application URL in launchSettings and enhance task sorting by priority in ProjectBoardListQueryHandler
|
2026-01-08 10:46:04 +03:30 |
|
SamSys
|
07a4ce1f64
|
merge from SmsReportApi
|
2026-01-07 18:40:15 +03:30 |
|
SamSys
|
4de2e12ac5
|
AmaApiReport
|
2026-01-07 18:38:12 +03:30 |
|
|
|
7423391003
|
Merge branch 'Feature/program-manager/priority'
# Conflicts:
# ServiceHost/Areas/Admin/Controllers/ProgramManager/ProjectController.cs
|
2026-01-07 18:05:46 +03:30 |
|
|
|
572f66f905
|
feat: implement auto-pending for task sections reaching estimated time
|
2026-01-07 16:52:50 +03:30 |
|
SamSys
|
7207172ce0
|
Merge branch 'Main' of https://github.com/samsyntax24/OriginalGozareshgir into Main
|
2026-01-07 16:29:51 +03:30 |
|
SamSys
|
48b75d2baa
|
Sms Report get list init
|
2026-01-07 16:29:03 +03:30 |
|
|
|
048da40f3c
|
Merge branch 'Feature/institution-contract/sent-to-customer-flag' into Main
|
2026-01-07 16:23:28 +03:30 |
|
|
|
140414b866
|
feat: add SetIsSent endpoint to update contract send status
|
2026-01-07 16:23:11 +03:30 |
|
SamSys
|
63edb33bf5
|
Sms Report Init
|
2026-01-07 14:49:44 +03:30 |
|
SamSys
|
3280202644
|
Merge branch 'Main' of https://github.com/samsyntax24/OriginalGozareshgir into Main
|
2026-01-07 13:03:42 +03:30 |
|
|
|
1a334c22b8
|
feat: enable change priority endpoint in ProjectController
|
2026-01-07 13:02:52 +03:30 |
|
SamSys
|
a1bda5bc54
|
Merge branch 'Main' of https://github.com/samsyntax24/OriginalGozareshgir into Main
|
2026-01-07 12:18:45 +03:30 |
|
|
|
c80be16807
|
Merge branch 'Feature/program-manager/priority' into Main
|
2026-01-07 12:11:52 +03:30 |
|
|
|
2bea265989
|
feat: implement task priority change command and update project/task DTOs
|
2026-01-07 12:11:24 +03:30 |
|
|
|
ef9b78b924
|
Merge branch 'refs/heads/master' into Feature/program-manager/priority
|
2026-01-07 12:01:38 +03:30 |
|
SamSys
|
f6a285b6ea
|
Merge branch 'Main' of https://github.com/samsyntax24/OriginalGozareshgir into Main
|
2026-01-07 11:37:10 +03:30 |
|
|
|
68b1f89ef0
|
chore: comment out ChangePriority endpoint in ProjectController
|
2026-01-07 11:34:06 +03:30 |
|
SamSys
|
56fc69f99f
|
Merge branch 'Main' of https://github.com/samsyntax24/OriginalGozareshgir into Main
|
2026-01-07 11:29:33 +03:30 |
|
|
|
d6096b232d
|
Merge branch 'Feature/program-manager/chat' into Main
# Conflicts:
# .gitignore
|
2026-01-07 11:18:03 +03:30 |
|
|
|
a81e01ce2b
|
Remove Storage folder from git tracking
|
2026-01-07 10:44:09 +03:30 |
|
|
|
6d5c032802
|
Merge branch 'Feature/program-manager/priority' into Main
|
2026-01-07 10:26:11 +03:30 |
|
|
|
71c0cff03a
|
Merge branch 'master' into Main
|
2026-01-07 10:25:52 +03:30 |
|
|
|
2cd838a5e3
|
feat: enhance thumbnail generation with category support and update storage paths
|
2026-01-07 10:25:33 +03:30 |
|
|
|
3da7453ece
|
feat: add assignment status tracking for projects, phases, and tasks
|
2026-01-06 21:47:22 +03:30 |
|
SamSys
|
ebcb7530e0
|
Merge branch 'WorskhopClassifiedPlan' into Main
|
2026-01-06 17:36:05 +03:30 |
|
SamSys
|
9ff9b0be18
|
add salary list
|
2026-01-06 17:33:40 +03:30 |
|
SamSys
|
ceb328cfa7
|
Save AddOrEdit Jobs to group
|
2026-01-06 15:28:12 +03:30 |
|
