Compare commits
merge into: admin:Feature/program-manager/set-permission-board
admin:master
admin:Feature/general/docker
admin:Main
admin:Feature/salary-aid/client-api
admin:Feature/roll-call/client-api
admin:Feature/program-manager/request-additional-time
admin:Feature/SmsRepoetApi
admin:Feature/loan/client-api
admin:Feature/EmployeesBankInfo/client-api
admin:Feature/file/import-excel-for-modification
admin:Feature/program-manager/BugSection
admin:Feature/CheckoutReward
admin:Fix/program-manager/fix-some-bugs
admin:AdminCheckoutApi
admin:Feature/Checkout/client-api
admin:Feature/program-manager/chat
admin:Feature/fine/client-api
admin:Feature/reward/client-api
admin:Feature/program-manager/priority
admin:Feature/program-manager/make-InComplete-on-set-time
admin:Feature/institution-contract/sent-to-customer-flag
admin:Feature/gateway/add-debt-payment
admin:Feature/institution-contract/refactor-creation
admin:Feature/program-manager/test-upload
admin:Feature/institution-contract/change-account-with-data
admin:Feature/institution-contract/fix-discount-data
admin:Feature/Excel/instiutition-contract
admin:Feature/ClientEmployeePageApi
admin:deploy-org
admin:Feature/Excel/asghaee-chekcout
admin:Feature/institution-contract/refactor-list
admin:Feature/Employee/get-list-api
admin:Feature/ClientLeavePageApi
admin:ServiceAmountManagmentApi
admin:Feature/institution-contract/verify-mannually
admin:Feature/Excel/yekta-customize-checkout
admin:Feature/roll-call/camera-api
admin:Feature/Insurance/client-api
admin:Feature/institution-contract/print
admin:Feature/contracts/api
admin:Feature/program-manager/set-permission-board
admin:Feature/program-manager/signalR-notification
admin:Feature/program-manager/move
admin:Feature/roll-call/camera-bug-report
admin:Feature/authorize/program-manager
admin:Feature/notification/create-api
admin:Feature/program-manager/connect
admin:Feature/customize-checkout/pizza-amir
admin:Feature/Excel/get-future-institutioncontract-contractingParty-details
admin:Feature/InstitutionContract/set-discount
admin:Feature/client/dashboard
admin:Feature/InstitutionContract/edit-phone
admin:Feature/Login/Api
admin:Feature/InstitutionContract/add-workshop-totalAmount-to-list
admin:Feature/FinancialInvoice/Init
admin:Feature/roll-call/apk-versioning
admin:Feature/gateway/sepehr-init
admin:Feature/InstitutionContract/upgrade
admin:WorskhopClassifiedPlan
admin:Feature/InstitutionContract/deactive-api
admin:Feature/roll-call/current-day-api
admin:Feature/InstitutionContract/exclude-future-contracts
admin:Feature/InstitutionContract/print-api
admin:Feature/roll-call/admin-report-api
admin:Feature/sms_service/move_smsResult_to_infrastructure
admin:Feature/InstitutionContract/add-old-edit-api
admin:Fix/change-absence-names
admin:Feature/roll-call/add-time-differences-to-print
admin:Feature/authorized-bank-details/init
admin:Feature/InstitutionContract/redirect-verification-payment
admin:Feature/contracting-party-bank-account/add-inquiry
admin:Feature/Registeration-workflow/add-existed-employer
admin:Feature/admin-dashboard/add-date-details
admin:Fix/workflow/remove-b-workshops-in-employeedocument
admin:Fix/institution-contract/list-search
admin:Feature/Insurance/add-not-created-tab
admin:Feature/law/add-edit-law
admin:Feature/InstitutionContract/add-registration-style
admin:Feature/Leave/add-invalid-leave
admin:Feature/Excel/GetWorkshopData
admin:Feature/Excel/Get-exception-institution-contracts
admin:Feature/admin-dashboard/migrate-next
admin:Feature/contracting-party/modify-apis
admin:Feature/accounts/show-admin-based-on-role
admin:Feature/admin-dashboard/api
admin:Feature/BgService/init
admin:Api
admin:Fix/RollCall/EmployeeUploadPictureBug
admin:Feature/Employee/CreateEmployeeWithoutAuthentication
admin:Upload/dad-mehr
admin:Feature/Checkout-Contract/AutoSigner
admin:Feature/EmployeeComputeOptions/Checkout-Contract
admin:Feature/CWS/WeeklyOffDay
admin:Feature/Checkout/SaveRollCalls
admin:Feature/Insurance/New-InsurnaceList-Operation
admin:Feature/Insurance/govermentlist-Calculation
admin:FixCheckoutBug
admin:Feature/Register/Init
admin:Feature/SubAccount/ChangeRole
admin:Feature/Main/EditCCheckout-on-SalaryAid-reward&CalculationDate
admin:Fix/RollCall/FindRotating-Shift
admin:Fix/LeftWorkTemp/CreateDuplicateLeftWorkTemp
admin:Fix/CustomizeCheckout/Change31DaysTo30
admin:Feature/set-RCES-On-leftworkTemp
admin:Feature/Customize-Checkout-Header
admin:Fix/CustomzieCheckout-SalaryAid
admin:Custom-Checkout-For-Kebab-Mahdi
admin:CreateRewardForKebabMahdi
admin:customizeCheckoutBug
...
pull from: admin:Feature/InstitutionContract/add-old-edit-api
admin:Feature/general/docker
admin:master
admin:Main
admin:Feature/salary-aid/client-api
admin:Feature/roll-call/client-api
admin:Feature/program-manager/request-additional-time
admin:Feature/SmsRepoetApi
admin:Feature/loan/client-api
admin:Feature/EmployeesBankInfo/client-api
admin:Feature/file/import-excel-for-modification
admin:Feature/program-manager/BugSection
admin:Feature/CheckoutReward
admin:Fix/program-manager/fix-some-bugs
admin:AdminCheckoutApi
admin:Feature/Checkout/client-api
admin:Feature/program-manager/chat
admin:Feature/fine/client-api
admin:Feature/reward/client-api
admin:Feature/program-manager/priority
admin:Feature/program-manager/make-InComplete-on-set-time
admin:Feature/institution-contract/sent-to-customer-flag
admin:Feature/gateway/add-debt-payment
admin:Feature/institution-contract/refactor-creation
admin:Feature/program-manager/test-upload
admin:Feature/institution-contract/change-account-with-data
admin:Feature/institution-contract/fix-discount-data
admin:Feature/Excel/instiutition-contract
admin:Feature/ClientEmployeePageApi
admin:deploy-org
admin:Feature/Excel/asghaee-chekcout
admin:Feature/institution-contract/refactor-list
admin:Feature/Employee/get-list-api
admin:Feature/ClientLeavePageApi
admin:ServiceAmountManagmentApi
admin:Feature/institution-contract/verify-mannually
admin:Feature/Excel/yekta-customize-checkout
admin:Feature/roll-call/camera-api
admin:Feature/Insurance/client-api
admin:Feature/institution-contract/print
admin:Feature/contracts/api
admin:Feature/program-manager/set-permission-board
admin:Feature/program-manager/signalR-notification
admin:Feature/program-manager/move
admin:Feature/roll-call/camera-bug-report
admin:Feature/authorize/program-manager
admin:Feature/notification/create-api
admin:Feature/program-manager/connect
admin:Feature/customize-checkout/pizza-amir
admin:Feature/Excel/get-future-institutioncontract-contractingParty-details
admin:Feature/InstitutionContract/set-discount
admin:Feature/client/dashboard
admin:Feature/InstitutionContract/edit-phone
admin:Feature/Login/Api
admin:Feature/InstitutionContract/add-workshop-totalAmount-to-list
admin:Feature/FinancialInvoice/Init
admin:Feature/roll-call/apk-versioning
admin:Feature/gateway/sepehr-init
admin:Feature/InstitutionContract/upgrade
admin:WorskhopClassifiedPlan
admin:Feature/InstitutionContract/deactive-api
admin:Feature/roll-call/current-day-api
admin:Feature/InstitutionContract/exclude-future-contracts
admin:Feature/InstitutionContract/print-api
admin:Feature/roll-call/admin-report-api
admin:Feature/sms_service/move_smsResult_to_infrastructure
admin:Feature/InstitutionContract/add-old-edit-api
admin:Fix/change-absence-names
admin:Feature/roll-call/add-time-differences-to-print
admin:Feature/authorized-bank-details/init
admin:Feature/InstitutionContract/redirect-verification-payment
admin:Feature/contracting-party-bank-account/add-inquiry
admin:Feature/Registeration-workflow/add-existed-employer
admin:Feature/admin-dashboard/add-date-details
admin:Fix/workflow/remove-b-workshops-in-employeedocument
admin:Fix/institution-contract/list-search
admin:Feature/Insurance/add-not-created-tab
admin:Feature/law/add-edit-law
admin:Feature/InstitutionContract/add-registration-style
admin:Feature/Leave/add-invalid-leave
admin:Feature/Excel/GetWorkshopData
admin:Feature/Excel/Get-exception-institution-contracts
admin:Feature/admin-dashboard/migrate-next
admin:Feature/contracting-party/modify-apis
admin:Feature/accounts/show-admin-based-on-role
admin:Feature/admin-dashboard/api
admin:Feature/BgService/init
admin:Api
admin:Fix/RollCall/EmployeeUploadPictureBug
admin:Feature/Employee/CreateEmployeeWithoutAuthentication
admin:Upload/dad-mehr
admin:Feature/Checkout-Contract/AutoSigner
admin:Feature/EmployeeComputeOptions/Checkout-Contract
admin:Feature/CWS/WeeklyOffDay
admin:Feature/Checkout/SaveRollCalls
admin:Feature/Insurance/New-InsurnaceList-Operation
admin:Feature/Insurance/govermentlist-Calculation
admin:FixCheckoutBug
admin:Feature/Register/Init
admin:Feature/SubAccount/ChangeRole
admin:Feature/Main/EditCCheckout-on-SalaryAid-reward&CalculationDate
admin:Fix/RollCall/FindRotating-Shift
admin:Fix/LeftWorkTemp/CreateDuplicateLeftWorkTemp
admin:Fix/CustomizeCheckout/Change31DaysTo30
admin:Feature/set-RCES-On-leftworkTemp
admin:Feature/Customize-Checkout-Header
admin:Fix/CustomzieCheckout-SalaryAid
admin:Custom-Checkout-For-Kebab-Mahdi
admin:CreateRewardForKebabMahdi
admin:customizeCheckoutBug
These branches are equal.