Commit Graph

1267 Commits (1930ce89b336ddd5d9f56ebe1a4a20cd5bae65fa)

Author SHA1 Message Date
Sultan khan 1930ce89b3 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_merge
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Update to stores VersionID 10.4
  Updates
11 hours ago
Sultan khan c4051aefb5 no message 11 hours ago
haroon amjad f57ae71704 Update to stores VersionID 10.4 11 hours ago
haroon amjad b1e9436b91 Merge branch 'master_merge' 13 hours ago
haroon amjad bcdcc69921 Updates 13 hours ago
Sultan khan dbc92e9e29 last login dependent updated 14 hours ago
Sultan khan 3a31b8f430 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_merge
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Updates
  NFC fix

# Conflicts:
#	lib/api/profile_api_client.dart
1 day ago
Sultan khan 4ebcf59b9d updates and fixes 1 day ago
haroon amjad 0ffbadedc3 Updates 2 days ago
haroon amjad e78252126d Merge branch 'master_merge' 2 days ago
Sultan khan 39f8f821de no message 2 days ago
haroon amjad 6ee3594403 NFC fix 2 days ago
Sultan khan 2b53a56b15 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_merge
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Android device id plugin changed
3 days ago
Sultan khan 83df2f3626 bug fixes and added contact approval process api 3 days ago
haroon amjad 396ea61086 Android device id plugin changed 3 days ago
Haroon Amjad 439140dba2 Update to stores, VersionID 10.2 1 week ago
haroon amjad 67802bb021 Updates 1 week ago
Sultan khan 59efdf382b no message 1 week ago
Sultan khan f9332d29ae no message 1 week ago
haroon amjad 38906e24b7 Merge branch 'master' into wala_plus_with_dialog_removal
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Flutter/AppFrameworkInfo.plist
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner/Info.plist
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/models/get_mobile_login_info_list_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
#	pubspec.yaml
1 week ago
Sultan khan c32b155718 ui updates 1 week ago
haroon amjad efee685178 Security changes 1 week ago
FaizHashmi 48e5d70ada made the city search functional 2 weeks ago
FaizHashmi 06295821aa made the city search functional 2 weeks ago
FaizHashmi 6ba06065b3 Fav Tab Changes and SearchBar Fix 2 weeks ago
FaizHashmi ef7078c152 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 3 weeks ago
FaizHashmi 252b9b471c Toast fixed 3 weeks ago
Sultan khan bd6e9577e3 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Toast fixed

# Conflicts:
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
3 weeks ago
Sultan khan e6cc2491b4 no message 3 weeks ago
Sultan khan 5194f8b1fd no message 3 weeks ago
FaizHashmi 2fb4a99a42 Toast fixed 3 weeks ago
Sultan khan fe36263ac0 design changed 3 weeks ago
Sultan khan 99c2d658e1 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Toast fixed
3 weeks ago
Sultan khan 1d2ed863ae no message 3 weeks ago
FaizHashmi b931ed8138 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 3 weeks ago
FaizHashmi b25b398695 Toast fixed 3 weeks ago
Sultan khan c957d547a8 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Toast fixed
3 weeks ago
Sultan khan a517e4e48b last login token updated. 3 weeks ago
FaizHashmi a0c5ac7e6c Toast fixed 3 weeks ago
Sultan khan 7043f0f91c Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  FIXING
  fixed toast color
3 weeks ago
FaizHashmi 99646c90c5 FIXING 3 weeks ago
Sultan khan 1a4dd29a9b no message 3 weeks ago
FaizHashmi 9bcb6c6b8a fixed toast color 3 weeks ago
FaizHashmi a152fe1da2 Fav Fix 3 weeks ago
FaizHashmi 367218702b Filters Fix 3 weeks ago
FaizHashmi c976b9c9db Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 3 weeks ago
FaizHashmi ca9c7f7e5d Filters Fix 3 weeks ago
Sultan khan d23910351f bottomsheet added 3 weeks ago
FaizHashmi fc04ff13bc chip color change 3 weeks ago
FaizHashmi 9aa368dbf7 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 3 weeks ago