Commit Graph

182 Commits (15577c3cfb6a692431d49898869fcdc08b7647b9)
 

Author SHA1 Message Date
Faiz Hashmi 15577c3cfb Merge branch 'aamir_dev' into faiz_development_common
# Conflicts:
#	lib/view_models/payment_view_model.dart
1 month ago
Aamir.Muhammad df0bb8fb28 changes 1 month ago
Faiz Hashmi f290f2e04f Request Module Completed 1 month ago
Faiz Hashmi 55363e4e9f Reformatting 2 months ago
Faiz Hashmi 623d21fc80 request_detail_page.dart 2 months 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
2 months ago
Aamir.Muhammad 8fc14ee2bc fonts fixes & changes 2 months ago
Faiz Hashmi 910e56f64a minor change 2 months ago
Faiz Hashmi c3696586f3 Service Request Done 2 months 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
2 months ago
Faiz Hashmi b8c890f15e Formatting 2 months ago
Aamir.Muhammad 1f41907962 fonts fixes & changes 2 months ago
Aamir.Muhammad 27f670917a Merge branch 'refs/heads/faiz_development_common' into aamir_dev 2 months ago
Faiz Hashmi c1eef03f82 pushing changes 2 months ago
Aamir.Muhammad 4de57025a9 fonts 2 months ago
Faiz Hashmi 31a9b71b83 Model Refactoring 2 months ago
Faiz Hashmi 3ce3d2b1db Fixes few things 2 months ago
Faiz Hashmi dfa57dbe55 Added Damage Pictures in ad_detail_view and extend edit ad 2 months ago
Faiz Hashmi 424942bf58 Updated both apps' structure 2 months ago
Faiz Hashmi e2a5bbfb65 merge conflict 3 months 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
3 months ago
Aamir.Muhammad f2ab8529e9 subscription & profile 3 months 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
3 months ago
Aamir.Muhammad 9a8a21e41b subscription & profile 3 months ago
Faiz Hashmi fc2b400845 added notifications 3 months ago
Faiz Hashmi 5e8a8412d3 vhanges 3 months 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
3 months ago
Faiz Hashmi 9b50be3b05 Debugging changes for request management chat 3 months ago
Aamir.Muhammad b4a3819c36 subscription & profile 3 months ago
Aamir.Muhammad cb04d4a2fb arabic fonts, logout, subscription app state. 3 months ago
Aamir.Muhammad b7d3e4ab72 appointment fix 3 months ago
Aamir.Muhammad cd97cbda78 Merge branch 'refs/heads/master' into localization_aamir 3 months ago
Aamir.Muhammad 13c28a14f1 appointment slider & subscription fix 3 months ago
Faiz Hashmi 7f0df61ff0 Merge branch 'localization_aamir' into faiz_development_common 3 months ago
Aamir.Muhammad 77d08afd0d Localization 1.1 3 months ago
Faiz Hashmi de3b37873a removed provider check on register_selection_page.dart 3 months ago
Faiz Hashmi e699b8f4a6 Merge branch 'localization_aamir' into faiz_development_common
# Conflicts:
#	lib/views/advertisement/ads_filter_view.dart
3 months ago
Aamir.Muhammad 9d1e463281 Login Skip 3 months ago
Aamir.Muhammad 201cbd185c Localization 3 months ago
Aamir.Muhammad 2e9d665aaf Localization 3 months ago
Aamir.Muhammad 4abcd4efe3 Localization 3 months ago
Faiz Hashmi b1f8ffab53 Merge remote-tracking branch 'origin/localization_aamir' into faiz_development_common 3 months ago
Faiz Hashmi 2804003472 Ad Change 3 months ago
Aamir.Muhammad fcd5436fb7 Localization 1 3 months ago
Faiz Hashmi aebcd089ef Merge remote-tracking branch 'origin/aamir_dev' into faiz_development_common
# Conflicts:
#	lib/view_models/ad_view_model.dart
4 months ago
Faiz Hashmi 0c5a45f5af Added AdUpdateFlow 4 months ago
Aamir.Muhammad 03aa7a5d01 Localization 4 months ago
Aamir.Muhammad b228e88a94 user profile & settings & api's 4 months ago
Aamir.Muhammad 0b5ec2d2f7 Merge branch 'refs/heads/faiz_development_common' into aamir_dev 4 months ago
Faiz Hashmi 08cb3f4a85 Merge branch 'aamir_dev' into faiz_development_common 5 months ago