Commit Graph

293 Commits (cd399a032c77191f2ed30278e5ced21d23fca41f)

Author SHA1 Message Date
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
9 hours ago
Haroon Amjad 439140dba2 Update to stores, VersionID 10.2 1 day ago
Sultan khan 95888fdb64 no message 1 day 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
FaizHashmi 06295821aa made the city search functional 1 week ago
FaizHashmi 6ba06065b3 Fav Tab Changes and SearchBar Fix 1 week ago
FaizHashmi d75f9a9cc3 icons 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
FaizHashmi 2fb4a99a42 Toast fixed 2 weeks ago
Sultan khan fe36263ac0 design changed 2 weeks ago
Sultan khan 1d2ed863ae no message 2 weeks ago
Sultan khan a517e4e48b last login token updated. 2 weeks ago
Sultan khan 1a4dd29a9b no message 2 weeks ago
Sultan khan d23910351f bottomsheet added 2 weeks ago
Sultan khan a0967051e8 Arabic text updated. 2 weeks ago
Sultan khan a8f9d275f5 no message 2 weeks ago
Sultan khan 7c9599ff6e no message 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
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
FaizHashmi ec37e74bc0 fixed suggestions 3 weeks ago
FaizHashmi cc03ab6a80 minor changes 3 weeks ago
FaizHashmi e134e8d4e5 refactoriåtion 3 weeks ago
FaizHashmi ae816a1f8f toast gravity change 3 weeks ago
FaizHashmi e05e97a536 Updated the dialogs to toast 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
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
FaizHashmi f079b84614 km away fixed. 3 weeks ago
FaizHashmi f05aafbd52 km away fixed. 3 weeks ago
Sultan khan 94ad9bff62 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:
  changes
3 weeks ago
Sultan khan 330b317164 no message 3 weeks ago
FaizHashmi 858fa7edb7 changes 3 weeks ago
Sultan khan 4541bfb1db no message 3 weeks ago
Sultan khan 9638d98b76 no message 3 weeks ago
haroon amjad 9c994d8dec Merge branch 'master_mohemm_flutter'
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner/Info.plist
#	lib/main.dart
#	pubspec.yaml
4 weeks ago
Haroon Amjad f503dca074 Merge branch 'apilevel_raise' into master_merge
# Conflicts:
#	android/app/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	android/settings.gradle
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/api/dashboard_api_client.dart
#	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/ui/landing/dashboard_screen.dart
#	lib/ui/screens/mowadhafhi/mowadhafhi_hr_request.dart
#	pubspec.yaml
4 weeks ago
Sultan khan 0175c958ef translation added. 1 month ago
haroon amjad 41afe554e8 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
2 months ago
Sultan khan a9f0cb8216 CEI, worklist po pr filter, date issue in absence dynamic screen 2 months ago
Sultan khan f218dab93e PR changes done. 4 months ago
haroon amjad a9485d853f Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
7 months ago
Haroon Amjad 5ad012d602 Banner updates, VersionID 9.7 sent to stores 8 months ago