Commit Graph

2362 Commits

Author SHA1 Message Date
301a8f06f4 Merge branch 'Feature/Checkout/client-api' into Main 2026-01-18 13:15:37 +03:30
63a3027a17 add client checkout list controller 2026-01-18 12:51:58 +03:30
gozareshgir
8ec13ffae1 Merge branch 'master' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir 2026-01-14 14:40:50 +03:30
gozareshgir
5508d4e88f Checkout Compute Minuts Base 2026-01-14 14:39:51 +03:30
43abb74c61 Merge branch 'Feature/program-manager/chat'
# Conflicts:
#	ProgramManager/src/Application/GozareshgirProgramManager.Application/Modules/TaskChat/Queries/GetMessages/GetMessagesQuery.cs
2026-01-14 10:57:07 +03:30
73e6681baa add message type to search query 2026-01-14 10:46:44 +03:30
90b2fd2eab add order for skills in set time 2026-01-14 10:13:57 +03:30
gozareshgir
ae2427473b Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 17:54:43 +03:30
gozareshgir
2fc124bf6d Get Sms Details 2026-01-13 17:35:29 +03:30
gozareshgir
068d34b4b4 Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 17:08:58 +03:30
gozareshgir
1d88ca0fbb changes 2026-01-13 17:05:07 +03:30
gozareshgir
e2911dfc2a addnew dto 2026-01-13 17:00:59 +03:30
gozareshgir
377f95561c Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 16:43:29 +03:30
gozareshgir
cfb96d1277 Chenge Post Methods to fromBody 2026-01-13 16:42:50 +03:30
gozareshgir
b5c5be2cb6 change smsResult grouping 2026-01-13 16:26:04 +03:30
gozareshgir
b66dc81688 Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 15:35:29 +03:30
gozareshgir
f5c8888137 IsDev mode chak for instant sms 2026-01-13 15:33:08 +03:30
gozareshgir
20ff66da2f Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 15:18:05 +03:30
gozareshgir
4d7923936e InstantSms Send Completed 2026-01-13 15:16:33 +03:30
gozareshgir
2e95846336 Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-13 11:40:46 +03:30
ad91383e86 Merge branch 'Fix/program-manager/fix-some-bugs' into Main 2026-01-13 11:31:53 +03:30
6281a024ca Merge branch 'Feature/loan/client-api' into Main 2026-01-13 11:30:58 +03:30
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
gozareshgir
532065e3a8 Merge branch 'master' into Feature/SmsRepoetApi 2026-01-13 11:20:57 +03:30
gozareshgir
f7bfa37a77 SmsSettings List , create, edit, delete 2026-01-13 11:17:25 +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
87c3cebb60 set workshopId to readonly 2026-01-13 09:38:44 +03:30
d9c431e20e add project name search for board list 2026-01-13 09:23:53 +03:30
ff5180eb75 remove add task to phase 2026-01-12 17:39:54 +03:30
a1c9335487 add remaining time and spent time to get project list 2026-01-12 16:48:54 +03:30
gozareshgir
2746bf69ea Merge branch 'master' into Feature/SmsRepoetApi 2026-01-12 14:38:15 +03:30
gozareshgir
77dbb50512 BlueDeActiveAfterZeroDebt hangfire completed 2026-01-12 14:32:50 +03:30
gozareshgir
1c7e8824c7 DeActiveInstitutionEndOfContract hangfire completed 2026-01-12 13:10:58 +03:30
20ece4886c add task priority to CreateProjectCommand 2026-01-12 12:20:08 +03:30
0eff1b9a66 change default task priority from medium to low 2026-01-12 12:07:43 +03:30
gozareshgir
0d33d79620 unblock hangfire completed 2026-01-11 22:07:58 +03:30
gozareshgir
e4355faffc block and unblock 2026-01-11 21:10:29 +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
607c0780b6 Merge branch 'master' into Feature/loan/client-api 2026-01-10 11:50:52 +03:30
587fa40d81 fix percnetage condition 2026-01-10 10:45:38 +03:30
b741ab9ed2 fix contains no element error for empty skills 2026-01-10 10:34:20 +03:30
b6fde4903a Merge branch 'Feature/institution-contract/sent-to-customer-flag' 2026-01-08 15:03:07 +03:30
0772604432 feat: enhance GetMessagesQuery to include additional time notes in message retrieval 2026-01-08 15:02:43 +03:30
SamSys
ec8333c715 merg from master 2026-01-08 15:00:40 +03:30
SamSys
8aa93e089a legal Action Sms completed 2026-01-08 14:56:33 +03:30
59891d1199 Merge remote-tracking branch 'origin/master' 2026-01-08 14:16:22 +03:30