Commit Graph

1344 Commits (61fc2f7516492cc7016db150b8a56b502a724467)

Author SHA1 Message Date
haroon amjad 61fc2f7516 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/app_state/app_state.dart
#	pubspec.yaml
6 hours ago
haroon amjad f57ae71704 Update to stores VersionID 10.4 7 hours ago
haroon amjad b1e9436b91 Merge branch 'master_merge' 8 hours ago
haroon amjad bcdcc69921 Updates 8 hours ago
Sultan khan dbc92e9e29 last login dependent updated 9 hours ago
haroon amjad 1817647b27 Update to stores, VersionID 10.3 1 day ago
haroon amjad cfe56b6db0 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/widgets/mark_attendance_widget.dart
#	pubspec.yaml
1 day 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 1 day ago
haroon amjad e78252126d Merge branch 'master_merge' 1 day ago
Sultan khan 39f8f821de no message 1 day ago
haroon amjad 6ee3594403 NFC fix 2 days ago
haroon amjad 7bf91cdc40 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
2 days ago
Sultan khan 83df2f3626 bug fixes and added contact approval process api 2 days ago
haroon amjad 796e697dec Merge branch 'master_mohemm_flutter'
# Conflicts:
#	pubspec.yaml
3 days ago
haroon amjad 396ea61086 Android device id plugin changed 3 days ago
haroon amjad cd399a032c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	assets/langs/ar-SA.json
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	lib/provider/chat_provider_model.dart
#	lib/ui/dialogs/id/business_card_dialog.dart
1 week 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