Commit Graph

1102 Commits (b240f55affbb08ba4186963ce6e861267b870a6b)

Author SHA1 Message Date
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
7 hours ago
Sultan khan 3343e4fe10 sso and courses in app browser updated 7 hours ago
haroon amjad 2c9db30d6a Merge branch 'master' into etqan_ovr_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/provider/dashboard_provider_model.dart
7 hours ago
haroon amjad eb3eb1d102 updates 7 hours ago
aamir-csol 257b803cce QIPS-1205 2 weeks ago
aamir-csol dae746587f QIPS-1205 2 weeks ago
aamir-csol facb3bf4e6 QIPS-1205 2 weeks ago
aamir-csol 71d03ba664 QIPS-1205 2 weeks ago
aamir-csol 9f663df3cc QIPS-1205 2 weeks ago
aamir-csol a8f390d49f QIPS-1175,QIPS-1179,QIPS-1180 2 weeks ago
aamir-csol 2c7d3bf963 QIPS-1175,QIPS-1179,QIPS-1180 2 weeks ago
aamir-csol 31d1804f7a QIPS-1175,QIPS-1179,QIPS-1180 3 weeks ago
haroon amjad 82c9aa8a2f updates 4 weeks ago
aamir-csol 048c9b395f approval level commented Code for filter . 4 weeks ago
aamir-csol eea35e4d77 approval level commented Code for filter . 4 weeks ago
Sultan khan 19ccee6a20 updates 2 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
2 months ago
Sultan khan a426bc332e E-learning Mandatory Courses - CR# 7150 2 months ago
aamir-csol 12d8fd95ba approval level commented Code for filter . 2 months ago
aamir-csol eebaafcf7c approval level commented Code for filter . 2 months ago
aamir-csol a28eb4426b Merge remote-tracking branch 'origin/etqan_ovr_integration' into etqan_ovr_integration 2 months ago
aamir-csol dfa7d9a713 approval level commented Code for filter . 2 months ago
haroon amjad 9112b26987 updates 2 months ago
aamir-csol e3fcc992df approval level commented Code for filter . 2 months ago
aamir-csol d021c95def Parking Qr Solution 2 months ago
aamir-csol 74bcf3e1b7 translation 2 months ago
aamir-csol 912f7b23f1 Merge branch 'master' into etqan_ovr_integration 2 months ago
aamir-csol 99414bf787 Itiqan Ovr Completed 2 months ago
haroon amjad 90bf529865 CR-19329 - ERP MOWADHFAI System changes 2 months ago
haroon amjad 1ee51a7597 Changed the device identifier, Update to Stores VersionID 9.5 3 months ago
haroon amjad 9b3601f06a Update to Stores for Fixed Asset Disposal, VersionID 9.4 3 months ago
Sultan khan 89ea554c7a Merge branch 'flutter_upgrade_with_timesheet_changes' 4 months ago
Sultan khan 3d91a1444e wallet ticket fix 4 months ago
Sultan khan bc697df13d Merge branch 'flutter_upgrade_with_timesheet_changes' 4 months ago
Sultan khan fb35e256e7 CS Standard Change Request
CR-7260

Fixed Asset Disposal Request amendment
4 months ago
Sultan khan c9d5ab98a3 work-list fixes 4 months ago
aamir-csol b96c460d6b Get Notification User Information Updates 5 months ago
Sultan khan bf3f9b55fc changes for security ogout attempt.. 5 months ago
aamir-csol c191d4c0c0 Survey Title Key Fix 5 months ago
aamir-csol 0b08606813 Ticket History 5 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
5 months ago
aamir-csol c7e44965d6 Get Ticket Accural Balance Changes 5 months ago
haroon amjad 04a2561f7f Update to stores VersionID 9.2 5 months ago
haroon amjad 413db57206 favourites list changes 5 months ago
aamir-csol c06c020fb3 favorites search enabled. 5 months ago
aamir-csol cca95cee6a ticket changes moved to dashboard & wallet balance 6 months ago
aamir-csol 1bcecde59b ticket changes moved to dashboard 7 months ago
aamir-csol c8fa64171e coreLibraryDesugaringEnabled 7 months ago
haroon amjad 55ece8921f Merge branch 'mohem_flutter_upgrade'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
8 months ago
haroon amjad 7384f22942 Update to stores, VersionID 9.2 8 months ago