Commit Graph

58 Commits (73aedba023a5315960385c1567b0572e3207ac63)

Author SHA1 Message Date
aamir-csol ecc0869a23 Ticket 3 months ago
aamir-csol 90faa4dd5e Merge branch 'Courses-CR#-7150' into flutter_upgrade_with_timesheet_changes
# Conflicts:
#	lib/api/api_client.dart
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	lib/ui/screens/ticket/ticket_detailed_screen.dart
#	lib/widgets/sso_webview_widget.dart
3 months ago
Sultan khan 8ea831c2c4 color coding changes on the monthly leave calendar and prod e-learning URL added. 3 months ago
aamir-csol deffeda015 Alma 3 months ago
Sultan khan 5da81968d7 Merge branch 'greeting_card' into Courses-CR#-7150
* greeting_card:
  Greeting
  Greeting Card

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/generated/codegen_loader.g.dart
#	lib/provider/dashboard_provider_model.dart
3 months ago
Sultan khan b240f55aff Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into Courses-CR#-7150
# Conflicts:
#	lib/ui/landing/widget/menus_widget.dart
3 months ago
aamir-csol ba8908d4eb Greeting Card 4 months ago
haroon amjad 82c9aa8a2f updates 4 months ago
Sultan khan fe583c234b Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  approval level commented Code for filter .
  Parking Qr Solution
  CR-19329 - ERP MOWADHFAI System changes
  Changed the device identifier, Update to Stores VersionID 9.5
  Update to Stores for Fixed Asset Disposal, VersionID 9.4

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
5 months ago
Sultan khan a426bc332e E-learning Mandatory Courses - CR# 7150 5 months ago
aamir-csol d021c95def Parking Qr Solution 5 months ago
aamir-csol 5809aa157f Ticket Attachments 6 months ago
haroon amjad 1ee51a7597 Changed the device identifier, Update to Stores VersionID 9.5 6 months ago
aamir-csol 107846dd82 Merge branch 'refs/heads/master' into flutter_upgrade_with_timesheet_changes
# Conflicts:
#	android/app/build.gradle
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/landing/widget/services_widget.dart
8 months ago
aamir-csol c7e44965d6 Get Ticket Accural Balance Changes 8 months ago
aamir-csol cca95cee6a ticket changes moved to dashboard & wallet balance 9 months ago
Aamir Muhammad d651b34381 Merge branch 'flutter_upgrade_with_timesheet_changes' into mohem_flutter_upgrade
# Conflicts:
#	android/app/build.gradle
#	android/build.gradle
#	android/gradle.properties
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/api/dashboard_api_client.dart
#	lib/classes/consts.dart
#	lib/ui/screens/offers_and_discounts/offers_and_discounts_details.dart
#	lib/widgets/mark_attendance_widget.dart
#	pubspec.yaml
11 months ago
Aamir Muhammad f61817937b tickt booking implementation 11 months ago
Syed Taha Alam e50d1f70b2 upgraded the sdk to 35 11 months ago
Aamir Muhammad cd36d61640 logins apis 11 months ago
Aamir Muhammad 72c178382f time sheet changes 1 year ago
sultan khan c26b2d9a5f search employee inprogress 1 year ago
Sikander Saleem 6e3fc55fde event activity added - cont 1 year ago
haroon amjad f09f08be82 Store update to version 6.0 2 years ago
haroon amjad a48d703642 ITG ADs update 3 years ago
haroon amjad 1a8db3b0ee ERM Channel updates 3 years ago
haroon amjad 064be6d195 updates & fixes 3 years ago
haroon amjad d49a030580 PR details from PO implemented 3 years ago
haroon amjad 4bac19f9b8 Platform ID & Huawei fixes 3 years ago
haroon amjad 72501fd0d9 ITG Ads fix 3 years ago
haroon amjad 5e22bcc1da ERM Channel 3 years ago
Sikander Saleem fe02776a69 leave balance issues fixed. 4 years ago
haroon amjad 660fdb63dd Updates & fixes 4 years ago
Aamir Muhammad 30c7f5738d Merge branch 'master' into development_aamir 4 years ago
Aamir Muhammad 7d1086522d Chat Fixes & Counter Updated on Signal R 4 years ago
haroon amjad 4c53fcfdb6 updates & fixes 4 years ago
Fatimah Alshammari cd813a163f fix issues 4 years ago
haroon amjad 6463dfc424 Reverting fatima changes 4 years ago
haroon amjad d80f93a6dc Revert "no message"
This reverts commit 323741ad06.
4 years ago
haroon amjad 323741ad06 no message 4 years ago
Fatimah Alshammari 85be372ad8 Merge branch 'master' into fatima
# Conflicts:
#	lib/classes/consts.dart
#	lib/ui/leave_balance/add_leave_balance_screen.dart
4 years ago
Fatimah Alshammari 9d0bf4fe7e fix issues 4 years ago
Aamir Muhammad 0538a3c313 Chat Fixes & Chat Media Preview Api Implementation 4 years ago
Aamir Muhammad fa7e08c215 Advertisement Image/ Video Module 4 years ago
Aamir Muhammad 00dee97bca Chat Count Api / Chat Token Updates / Chat Call UI 4 years ago
devmirza121 937c4c18b5 Mark Attandence success animation and font settings 4 years ago
Sultan khan 8d9561b570 COC changes 4 years ago
Sikander Saleem 4b935f1dc5 leave balance dashboard added. 4 years ago
Sikander Saleem 6be8510b86 drawer menu ui changed. 4 years ago
devmirza121 8fe51a654c Merge branch 'master' into development_mirza
# Conflicts:
#	lib/extensions/string_extensions.dart
#	lib/main.dart
#	lib/ui/landing/today_attendance_screen.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
4 years ago