Commit Graph

89 Commits (55363e4e9f1d86bf99e26123d31269aec41edb33)

Author SHA1 Message Date
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
1 year 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
1 year ago
Aamir.Muhammad 9a8a21e41b subscription & profile 1 year ago
Faiz Hashmi fc2b400845 added notifications 1 year 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