Commit Graph

1210 Commits (9aa368dbf76aa965d65b2868787a9c19b415853c)

Author SHA1 Message Date
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
Sultan khan bd6e6c6f59 no message 2 weeks ago
Sultan khan 7c9599ff6e no message 2 weeks ago
FaizHashmi 62058d6dd9 chip set 2 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
2 weeks ago
Sultan khan cd2703cbc5 favorite offers done 2 weeks ago
FaizHashmi 6d4bddd42d Added filters 2 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
2 weeks ago
FaizHashmi 59bba20e20 added shimmer 2 weeks ago
Sultan khan 4b1589f7df 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 sub categories

# Conflicts:
#	lib/generated/locale_keys.g.dart
2 weeks ago
Sultan khan 975f6622b4 no message 2 weeks ago
FaizHashmi 154b62bbad Added sub categories 2 weeks ago
Sultan khan 821cdf474d ui updates 2 weeks ago
Sultan khan f6865959e6 no message 2 weeks ago
Sultan khan e21738cf5f no message 2 weeks ago
Sultan khan 518c766756 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:
  fixed suggestions
3 weeks ago
FaizHashmi ec37e74bc0 fixed suggestions 3 weeks ago
Sultan khan 58908df424 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:
  minor changes
  refactoriåtion
3 weeks ago
Sultan khan 7065a4fb23 no message 3 weeks ago
FaizHashmi cc03ab6a80 minor changes 3 weeks ago
FaizHashmi 287afc6ff1 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 3 weeks ago
FaizHashmi 6aec5b1a8c refactoriåtion 3 weeks ago
Sultan khan 4cd4766ab8 no message 3 weeks ago
FaizHashmi e134e8d4e5 refactoriåtion 3 weeks ago
Sultan khan 825845b4c3 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:
  changhes
  toast gravity change

# Conflicts:
#	lib/ui/landing/dashboard_screen_for_dependet.dart
3 weeks ago
Sultan khan 0a270bd323 login flow updated 3 weeks ago
FaizHashmi fa1cbf866b changhes 3 weeks ago
FaizHashmi ae816a1f8f toast gravity change 3 weeks ago
FaizHashmi 371a3ecb74 toast gravity change 3 weeks ago
FaizHashmi f19a1441b3 url change 3 weeks ago
FaizHashmi 857d1e74ac Merge branch 'wala_plus' into wala_plus_with_dialog_removal 3 weeks ago
FaizHashmi e05e97a536 Updated the dialogs to toast 3 weeks ago
Sultan khan 1f8564b10a Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  CHANGED THE BASE URL
3 weeks ago
Sultan khan d6310e5233 search 3 weeks ago
FaizHashmi 623957be1a CHANGED THE BASE URL 3 weeks ago
FaizHashmi aff3bc2fc0 fixed the dependent flow. 3 weeks ago
Sultan khan 2cc22bdc21 Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  dependent_details_screen.dart fix
3 weeks ago
FaizHashmi 269a1a4da8 dependent_details_screen.dart fix 3 weeks ago
Sultan khan 87bcdf72cb Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  UI Fixes
3 weeks ago
Sultan khan deae01a677 no message 3 weeks ago
FaizHashmi 771b16c519 UI Fixes 3 weeks ago
FaizHashmi 52821bf662 Merge remote-tracking branch 'origin/wala_plus' into wala_plus 3 weeks ago
FaizHashmi 2bcad27712 Fixes 3 weeks ago
Sultan khan 55727fe98b Merge branch 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus
* 'wala_plus' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Fixes
3 weeks ago
Sultan khan 84ff0798fa no message 3 weeks ago
FaizHashmi de57bfd9eb Fixes 3 weeks ago