Commit Graph

1645 Commits (f9332d29ae676e16391d310e7382805a4a654558)
 

Author SHA1 Message Date
Sultan khan f9332d29ae no message 23 hours ago
Sultan khan 95888fdb64 no message 23 hours ago
Sultan khan 548aa501a1 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:
  Security changes
  Update dependencies and remove unused keys from localization
  changes for Latest AGP
  Update dependencies and improve code structure
  chat history maintained
  translation added.
  Chat Bot Completed
  Chat Bot Completed
  chat bot & Speech to Text
2 days 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
2 days ago
Sultan khan c32b155718 ui updates 2 days ago
haroon amjad efee685178 Security changes 2 days ago
Sultan khan f483c858ef 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:
  made the city search functional
1 week ago
FaizHashmi 3dcb332a04 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 1 week ago
FaizHashmi 48e5d70ada made the city search functional 1 week ago
Sultan khan 3cf2c2a4c8 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:
  made the city search functional
1 week ago
FaizHashmi 06295821aa made the city search functional 1 week ago
Sultan khan ae1bd7f0c5 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:
  Fav Tab Changes and SearchBar Fix
  icons
1 week ago
FaizHashmi 6ba06065b3 Fav Tab Changes and SearchBar Fix 1 week ago
FaizHashmi d75f9a9cc3 icons 2 weeks ago
Sultan khan 63f678b666 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal 2 weeks ago
FaizHashmi ef7078c152 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 2 weeks ago
FaizHashmi 252b9b471c Toast fixed 2 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
2 weeks ago
Sultan khan e6cc2491b4 no message 2 weeks ago
Sultan khan 5194f8b1fd no message 2 weeks ago
FaizHashmi 2fb4a99a42 Toast fixed 2 weeks ago
Sultan khan fe36263ac0 design changed 2 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
2 weeks ago
Sultan khan 1d2ed863ae no message 2 weeks ago
FaizHashmi b931ed8138 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 2 weeks ago
FaizHashmi b25b398695 Toast fixed 2 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
2 weeks ago
Sultan khan a517e4e48b last login token updated. 2 weeks ago
FaizHashmi a0c5ac7e6c Toast fixed 2 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
2 weeks ago
FaizHashmi 99646c90c5 FIXING 2 weeks ago
Sultan khan 1a4dd29a9b no message 2 weeks ago
FaizHashmi 9bcb6c6b8a fixed toast color 2 weeks ago
Sultan khan e66154d476 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:
  Fav Fix
2 weeks ago
FaizHashmi 2a4cd36ba9 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 2 weeks ago
FaizHashmi a152fe1da2 Fav Fix 2 weeks ago
Sultan khan 6b364b4109 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:
  Filters Fix
  Filters Fix
2 weeks ago
FaizHashmi 367218702b Filters Fix 2 weeks ago
FaizHashmi c976b9c9db Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 2 weeks ago
FaizHashmi ca9c7f7e5d Filters Fix 2 weeks ago
Sultan khan d23910351f bottomsheet added 2 weeks ago
Sultan khan 49d46dada2 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:
  chip color change
2 weeks ago
FaizHashmi fc04ff13bc chip color change 2 weeks ago
Sultan khan a0967051e8 Arabic text updated. 2 weeks ago
Sultan khan bdf3337af4 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:
  chip color change
2 weeks ago
FaizHashmi 9aa368dbf7 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 2 weeks ago
FaizHashmi d6fdcb214d chip color change 2 weeks ago
Sultan khan a8f9d275f5 no message 2 weeks ago
Sultan khan ecf1c7c948 no message 2 weeks ago
Sultan khan 5a96d64d9c 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:
  chip set

# Conflicts:
#	lib/ui/landing/dashboard_screen_for_dependet.dart
2 weeks ago