Commit Graph

2451 Commits

Author SHA1 Message Date
3840d89433 Merge branch 'Feature/SmsRepoetApi' into Main 2026-01-27 20:21:18 +03:30
e0d10510e0 update RemoveSmsSetting method to return OperationResult 2026-01-27 20:20:54 +03:30
411363555f Merge branch 'master' into Main
# Conflicts:
#	ProgramManager/src/Infrastructure/GozareshgirProgramManager.Infrastructure/Services/FileManagement/FileUploadService.cs
2026-01-27 17:44:02 +03:30
a55492b16a add CancelSendVerificationSms flag to InstitutionContractExtensionCompleteRequest and update SMS sending logic 2026-01-27 17:43:05 +03:30
gozareshgir
faeb5e11a5 fix after conflict 2026-01-27 16:47:48 +03:30
gozareshgir
50b56d928d merg from BugSection 2026-01-27 16:47:33 +03:30
gozareshgir
9f09b6af97 change 2026-01-27 16:34:13 +03:30
gozareshgir
63e169b82d bug section completed 2026-01-27 16:32:55 +03:30
9596c8f8b6 refactor FileUploadService to simplify category folder naming 2026-01-27 16:24:34 +03:30
gozareshgir
7339eaaadf Merge branch 'master' of https://pm.gozareshgir.ir/gozareshgir/OriginalGozareshgir into Feature/program-manager/BugSection 2026-01-27 16:12:00 +03:30
gozareshgir
e5c96c8bcb comand and query for bug section 2026-01-27 16:11:31 +03:30
8622f12f12 add file upload service and integrate with message sending 2026-01-27 15:54:38 +03:30
a20a847065 add mahan user for static accounts 2026-01-27 15:37:02 +03:30
258a809451 add .env files to .gitignore 2026-01-27 15:10:18 +03:30
gozareshgir
187b7406d2 fix conflict 2026-01-27 14:14:51 +03:30
gozareshgir
c51bb90a2b merge from master 2026-01-27 14:14:40 +03:30
gozareshgir
6285c7320e New PermissionCode to ProgramManager 2026-01-27 14:05:20 +03:30
gozareshgir
17f117726e bugSection and BugDocument mapping and migration 2026-01-27 13:40:05 +03:30
gozareshgir
13fb6fec5d init 2026-01-26 18:35:22 +03:30
5bead0cc86 Merge branch 'Feature/program-manager/request-additional-time' into Main 2026-01-26 18:32:16 +03:30
9bca1b81d6 Merge remote-tracking branch 'origin/master' 2026-01-26 18:08:51 +03:30
9ff6b5cf56 fix rollcall mannaul edit bug 2026-01-26 18:08:33 +03:30
gozareshgir
04642b7257 Merge branch 'master' into Fix/program-manager/fix-some-bugs 2026-01-25 20:05:30 +03:30
c1c9fe51cb fix creation for institutioncontract on Not Authorized contracting party 2026-01-25 19:08:13 +03:30
gozareshgir
0d2ac58bbb change 2026-01-25 12:52:25 +03:30
64693b2ca3 add workflow result 2026-01-25 12:34:27 +03:30
43ccb3a1dd Merge remote-tracking branch 'origin/master' 2026-01-24 19:10:59 +03:30
0134111aba fix bug for extensions 2026-01-24 19:10:24 +03:30
gozareshgir
3cc7adae35 Merge branch 'Feature/CheckoutReward' 2026-01-24 18:58:24 +03:30
gozareshgir
c97ea5356f Add Reward To checkout Completed 2026-01-24 18:57:53 +03:30
64cb4baba9 Merge branch 'Feature/program-manager/request-additional-time' into Main 2026-01-24 17:31:35 +03:30
03657b6848 add missing data for task revisions 2026-01-24 17:29:08 +03:30
69f4819bf6 Add Migration For Reward checkout 2026-01-24 16:58:45 +03:30
gozareshgir
1257e15b62 changeMapping 2026-01-24 16:45:10 +03:30
gozareshgir
331fb24a99 CheckoutReward 2026-01-24 16:29:01 +03:30
3be1547137 fix mannually verify error 2026-01-24 16:25:22 +03:30
ce836476a1 Merge branch 'Feature/program-manager/request-additional-time' into Main
# Conflicts:
#	ProgramManager/src/Domain/GozareshgirProgramManager.Domain/ProjectAgg/Entities/Task/ProjectTask.cs
2026-01-24 14:04:29 +03:30
15f1c938f7 add workflow controller 2026-01-24 14:02:18 +03:30
7e563a0f01 add Task Revision query and revision and request mapping 2026-01-24 11:12:25 +03:30
900b4b3f4d add convention for print InstitutionContract for pending data 2026-01-22 12:58:43 +03:30
gozareshgir
be319f6286 fixed 2026-01-22 12:39:26 +03:30
gozareshgir
d3dacceab1 GetContractToCreateCheckout change 2026-01-22 12:37:28 +03:30
bdc6f95af8 fix activate all after create new 2026-01-22 12:26:13 +03:30
7a73e69afa Merge branch 'master' into Fix/program-manager/fix-some-bugs 2026-01-22 11:06:58 +03:30
a3fd3e6920 add mapping 2026-01-22 10:17:04 +03:30
gozareshgir
8db161f960 fix 2026-01-21 20:00:19 +03:30
gozareshgir
3bb16c02b4 merge from AdminCheckoutApi 2026-01-21 19:57:48 +03:30
025c59e695 Complete TaskSectionRevisionMapping.cs 2026-01-21 19:21:26 +03:30
gozareshgir
7a79343b2f GetContractsToCreateCheckout Completed 2026-01-21 19:20:15 +03:30
36ccd96352 add time section time request mapping 2026-01-21 19:17:52 +03:30