Commit Graph

1542 Commits (3bafd74857658e11d749abe3cded024c75964674)
 

Author SHA1 Message Date
haroon amjad 3bafd74857 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	pubspec.yaml
13 hours ago
haroon amjad 352c85dcd8 updates 13 hours ago
haroon amjad 152cd5c019 update 13 hours ago
haroon amjad 057e71e3c0 Etqan fixes, Update to Stores VersionID 9.6 13 hours ago
haroon amjad e4d182912c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	assets/langs/en-US.json
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	pubspec.yaml
22 hours ago
haroon amjad 480d9d466f updates 22 hours ago
haroon amjad bdaccf133c updates 23 hours ago
Haroon6138 16e2cc604f Merge pull request 'Courses-CR#-7150' (#20) from Courses-CR#-7150 into master
Reviewed-on: https://34.17.182.140/Haroon6138/mohemm-flutter-app/pulls/20
23 hours ago
Sultan khan d5c3ce4c62 Merge branch 'master' into Courses-CR#-7150
* master:
23 hours 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
23 hours ago
Haroon6138 6a80e21c3f Merge pull request 'Courses-CR#-7150' (#19) from Courses-CR#-7150 into master
Reviewed-on: https://34.17.182.140/Haroon6138/mohemm-flutter-app/pulls/19
1 day 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
1 day ago
Sultan khan 3343e4fe10 sso and courses in app browser updated 1 day 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
1 day ago
haroon amjad eb3eb1d102 updates 1 day ago
aamir-csol 257b803cce QIPS-1205 2 weeks ago
aamir-csol a958257ce9 Greeting 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 ba8908d4eb Greeting Card 2 weeks ago
aamir-csol a8f390d49f QIPS-1175,QIPS-1179,QIPS-1180 2 weeks ago
aamir-csol 2c7d3bf963 QIPS-1175,QIPS-1179,QIPS-1180 3 weeks ago
aamir-csol 31d1804f7a QIPS-1175,QIPS-1179,QIPS-1180 4 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 5705619ce4 untracked icon added 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 89fa395183 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/app_state/app_state.dart
#	lib/main.dart
#	pubspec.yaml
3 months ago
haroon amjad 1ee51a7597 Changed the device identifier, Update to Stores VersionID 9.5 3 months ago
haroon amjad 4d0918cd25 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	android/app/build.gradle
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/app_state/app_state.dart
#	lib/ui/landing/widget/app_drawer.dart
#	pubspec.yaml
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