 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 |
FaizHashmi
|
48e5d70ada
|
made the city search functional
|
1 week ago |
|
FaizHashmi
|
06295821aa
|
made the city search functional
|
1 week ago |
|
FaizHashmi
|
6ba06065b3
|
Fav Tab Changes and SearchBar Fix
|
1 week 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 |
|
FaizHashmi
|
a152fe1da2
|
Fav 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 |
|
FaizHashmi
|
fc04ff13bc
|
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 |
|
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 |