Commit Graph

121 Commits (7ab3caa364492c629cd1b726cd31a1ef9fd469c8)

Author SHA1 Message Date
Aamir 7ab3caa364 CMA 246, 247 1 year ago
Aamir d4ebcf998f changes 1 year ago
Aamir 382207d8b2 Merge branch 'master_new_changes' into aamir_dev
# Conflicts:
#	lib/services/payments_service.dart
#	pubspec.yaml
1 year ago
Faiz Hashmi 4c7b289d7e Bug Fixes 1 year ago
Aamir 5267d4292a Merge branch 'faiz_development_common' into master_new_changes
# Conflicts:
#	lib/models/subscriptions_models/subscription_model.dart
1 year ago
Faiz Hashmi d0e733ffd3 Bug Fixes 1 year ago
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
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