Commit Graph

165 Commits (021618fa6b04bd3de7828ca12f41846bdf5e1306)

Author SHA1 Message Date
Faiz Hashmi 0bbc288da9 Bug Fixes 1 year ago
Faiz Hashmi 3d9099d9e7 issues fixed 1 year ago
Aamir 1b37692dd7 Merge branch 'faiz_development_common' into master_new_changes
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/utils/location/Location.dart
#	lib/view_models/service_view_model.dart
#	lib/view_models/subscriptions_view_model.dart
#	lib/views/location_views/map_selection_widget.dart
#	lib/views/location_views/pick_location_page.dart
#	lib/views/setting_options/provider_license_page.dart
1 year ago
Aamir 73080483fc changes 1 year ago
faizatflutter 7453c7e2e5 SMALL FIXES 1 year ago
Faiz Hashmi 0d0597ae48 issues fixed 1 year ago
Faiz Hashmi ee4e7a7c2b Bug Fixed 1 year ago
Faiz Hashmi c99878f04a Issues Fixed 1 year ago
Faiz Hashmi b18b57ca93 bug fixes 1 year ago
Faiz Hashmi b2494d00ab Subs Push 1 year ago
Faiz Hashmi 6e74801852 Added Settings Modules 1 year ago
Faiz Hashmi 0230afc5c7 Fixed Ads Filter 1 year ago
Faiz Hashmi 450dfff6e8 Added Shipping Management 1 year ago
Faiz Hashmi fea3c806ec FixedThings Before QA 1 year ago
Faiz Hashmi e2f10aba52 FixedThings Before QA 1 year ago
Faiz Hashmi 4949a141b9 Added Media Viewer 1 year ago
Faiz Hashmi 3bd72ef382 Added Images support in ReqChat 1 year ago
Faiz Hashmi 56d6bc196b Fixed issues in ads extension and appointment 1 year ago
Faiz Hashmi 5eb1a939dc Merge branch 'aamir_dev' into faiz_development_common
# Conflicts:
#	lib/view_models/service_view_model.dart
1 year ago
Faiz Hashmi bb954b9771 Fixed the notes list 1 year ago
Aamir 36754b524d changes 1 year ago
Faiz Hashmi f0a9c294c2 Fixed the notes list 1 year ago
Aamir.Muhammad f5a71aa15b changes 1 year ago
Faiz Hashmi 15577c3cfb Merge branch 'aamir_dev' into faiz_development_common
# Conflicts:
#	lib/view_models/payment_view_model.dart
1 year ago
Aamir.Muhammad df0bb8fb28 changes 1 year ago
Faiz Hashmi f290f2e04f Request Module Completed 1 year ago
Faiz Hashmi 0ae831e163 Merge branch 'aamir_dev' into faiz_development_common
# Conflicts:
#	lib/views/appointments/widgets/common_appointment_slider_widget.dart
#	lib/widgets/extensions/extensions_widget.dart
1 year ago
Aamir.Muhammad 8fc14ee2bc fonts fixes & changes 1 year ago
Faiz Hashmi 910e56f64a minor change 1 year ago
Faiz Hashmi c3696586f3 Service Request Done 1 year ago
Faiz Hashmi e7fa2bfac8 Merge branch 'aamir_dev' into faiz_development_common
# Conflicts:
#	lib/models/provider_branches_models/branch_detail_model.dart
#	lib/views/advertisement/components/ads_list_widget.dart
#	lib/widgets/extensions/extensions_widget.dart
1 year ago
Faiz Hashmi b8c890f15e Formatting 1 year ago
Aamir.Muhammad 1f41907962 fonts fixes & changes 1 year ago
Faiz Hashmi c1eef03f82 pushing changes 1 year ago
Faiz Hashmi 31a9b71b83 Model Refactoring 1 year ago
Faiz Hashmi 3ce3d2b1db Fixes few things 1 year ago
Faiz Hashmi dfa57dbe55 Added Damage Pictures in ad_detail_view and extend edit ad 1 year ago
Faiz Hashmi 424942bf58 Updated both apps' structure 1 year ago
Faiz Hashmi 9457b0b412 Merge branch 'aamir_dev' into faiz_development_common
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/main.dart
#	lib/views/user/login_with_password_page.dart
2 years ago
Aamir.Muhammad 4777c5c952 Merge branch 'refs/heads/master' into aamir_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
2 years ago
Aamir.Muhammad 9a8a21e41b subscription & profile 2 years ago
Faiz Hashmi fc2b400845 added notifications 2 years ago
Faiz Hashmi a6d75fdcc3 Merge branch 'aamir_dev' into faiz_development_common
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/view_models/appointments_view_model.dart
2 years ago
Faiz Hashmi 9b50be3b05 Debugging changes for request management chat 2 years ago
Aamir.Muhammad b4a3819c36 subscription & profile 2 years ago
Aamir.Muhammad cb04d4a2fb arabic fonts, logout, subscription app state. 2 years ago
Aamir.Muhammad b7d3e4ab72 appointment fix 2 years ago
Aamir.Muhammad 13c28a14f1 appointment slider & subscription fix 2 years ago
Aamir.Muhammad 77d08afd0d Localization 1.1 2 years ago
Aamir.Muhammad 9d1e463281 Login Skip 2 years ago
Aamir.Muhammad 4abcd4efe3 Localization 2 years ago
Faiz Hashmi aebcd089ef Merge remote-tracking branch 'origin/aamir_dev' into faiz_development_common
# Conflicts:
#	lib/view_models/ad_view_model.dart
2 years ago
Faiz Hashmi 0c5a45f5af Added AdUpdateFlow 2 years ago
Aamir.Muhammad b228e88a94 user profile & settings & api's 2 years ago
Aamir.Muhammad 926f083e7f models updates & created edit add methods 2 years ago
Aamir.Muhammad 603fa08c42 Merge branch 'master' into aamir_dev
# Conflicts:
#	lib/api/api_client.dart
2 years ago
Faiz Hashmi 81b18659d7 Bug Fixes 2 years ago
Aamir.Muhammad 3ca0b9776b Biometric Auth 2 years ago
Aamir.Muhammad 7ab427e113 Merge branch 'faiz_development_common' into aamir_dev 2 years ago
Aamir.Muhammad 0b073b23fa Merge remote-tracking branch 'origin/faiz_development_common' into aamir_dev
# Conflicts:
#	pubspec.lock
2 years ago
Aamir.Muhammad cec6d171e0 Biometric Auth 2 years ago
Faiz Hashmi f874e1fcb0 Added Ads Filter 2 years ago
Faiz Hashmi 69fc3346c6 Added Ads Filter and Appointments Filter 2 years ago
Faiz Hashmi 55c3af0540 Added Branch FilterView and their API integrations 2 years ago
Faiz Hashmi 342d9b2672 Added Branch FilterView 2 years ago
Faiz Hashmi 7c84037601 Merge branch 'faiz_development_common' 2 years ago
Mirza.Shafique@cloudsolutions.com.sa d5745847bf subscription updates 2 years ago
Faiz Hashmi d375b9dff3 Reservation Deal Completion WIP 2 years ago
Faiz Hashmi f970e4a540 Added Account Screens as per new Design 2 years ago
FaizHashmiCS22 3f7527f4b2 Appointment Flow Testing 2 years ago
Faiz Hashmi d029656866 debugging changes 2 years ago
FaizHashmiCS22 dc145661c8 chat debugging changes 2 years ago
Mirza.Shafique@cloudsolutions.com.sa a7ba63d281 Merge branch 'mirza_development'
# Conflicts:
#	lib/view_models/appointments_view_model.dart
2 years ago
Faiz Hashmi 01d9ad68a2 Chat Implementation 1.0 2 years ago
Mirza.Shafique@cloudsolutions.com.sa 511342adef Appointment implementation in Provider 1.0 2 years ago
Mirza.Shafique@cloudsolutions.com.sa 4962ea2d8b Appointment implementation in Provider 2 years ago
Faiz Hashmi a76b8d8244 Merge branch 'master' into faiz_development_common 2 years ago
Faiz Hashmi 837191a5e1 Chat Implementation 1.0 2 years ago
Mirza.Shafique@cloudsolutions.com.sa 5999804bc6 Book Appointment 1.0 2 years ago
Faiz Hashmi 6245aa9ef4 fixed messages bug 2 years ago
Faiz Hashmi 98b35fbc61 Chat Module almost finished! 2 years ago
Faiz Hashmi c5cefa2309 models refinement 2 years ago
Faiz Hashmi 76fd46c654 models refinement 2 years ago
Faiz Hashmi 08fd442a36 Adding Chat Repo 2 years ago
Faiz Hashmi 95fec1e62d added setting screens 2 years ago
Faiz Hashmi 8168e5a81d Added Special Service Appointment Module 2 years ago
Faiz Hashmi fd6b7c2803 Request Module added to common 2 years ago
Faiz Hashmi b9a5429de5 Request Module iAP 2 years ago
Faiz Hashmi 8a8efa37f2 Added Appoinment Module and Ads Filter 2 years ago
Faiz Hashmi 057a202ed9 Appointment Module's payment final changes! 2 years ago
Faiz Hashmi 63263801af Merge branch 'master' into mirza_development
# Conflicts:
#	lib/models/generic_resp_model.dart
#	lib/utils/enums.dart
2 years ago
Faiz Hashmi e9462ff438 Merge branch 'faiz_development_common' 2 years ago
Faiz Hashmi d412383aad Ads and Appointment Module Progress 2 years ago
devshafique c0d88f314c Request Management 2.0 2 years ago
devshafique 4b08a974bb Request Management 1.0 2 years ago
devshafique 99baa06cfa Merge branch 'master' into mirza_development
# Conflicts:
#	lib/utils/enums.dart
#	lib/widgets/extensions/extensions_widget.dart
2 years ago
Faiz Hashmi a841c232de Ad Module Commit 2 years ago
devshafique aa3639d38a Provider Dealer User 2 years ago
Faiz Hashmi d93947152a Ad Details Page Checls 2 years ago
FaizHashmiCS22 35262c804a Merge branch 'master' into faiz_development_common
# Conflicts:
#	lib/classes/consts.dart
#	lib/views/advertisement/ads_list.dart
3 years ago