Commit Graph

1625 Commits (3dcb332a045cc4d97a4ac6a75ed3748d755a9085)
 

Author SHA1 Message Date
FaizHashmi 3dcb332a04 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 2 weeks ago
FaizHashmi 48e5d70ada made the city search functional 2 weeks 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
2 weeks ago
FaizHashmi 06295821aa made the city search functional 2 weeks 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
2 weeks ago
FaizHashmi 6ba06065b3 Fav Tab Changes and SearchBar Fix 3 weeks ago
FaizHashmi d75f9a9cc3 icons 3 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 3 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
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
3 weeks ago
FaizHashmi 2a4cd36ba9 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 3 weeks ago
FaizHashmi a152fe1da2 Fav Fix 3 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
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
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
3 weeks ago
FaizHashmi fc04ff13bc chip color change 3 weeks ago
Sultan khan a0967051e8 Arabic text updated. 3 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
4 weeks ago
FaizHashmi 9aa368dbf7 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 4 weeks ago
FaizHashmi d6fdcb214d chip color change 4 weeks ago
Sultan khan a8f9d275f5 no message 4 weeks ago
Sultan khan ecf1c7c948 no message 4 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
4 weeks ago
Sultan khan bd6e6c6f59 no message 4 weeks ago
Sultan khan 7c9599ff6e no message 4 weeks ago
FaizHashmi 62058d6dd9 chip set 4 weeks ago
Sultan khan 37303458bf 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:
  Added filters

# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen_for_dependet.dart
4 weeks ago
Sultan khan cd2703cbc5 favorite offers done 4 weeks ago
FaizHashmi 6d4bddd42d Added filters 4 weeks ago
Sultan khan 3a73ec1c2e 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:
  added shimmer

# Conflicts:
#	lib/generated/locale_keys.g.dart
4 weeks ago