Commit Graph

123 Commits (2215bbd63b50d5ba33a80734c269fb0d8ea1ea7c)

Author SHA1 Message Date
Faiz Hashmi 2215bbd63b Changes 1 year ago
Faiz Hashmi 656dbfd5ac Changes 1 year ago
Faiz Hashmi 4b350dbeb6 Minor Fixes 1 year ago
Faiz Hashmi 0ada291516 Merge branch 'aamir_dev' into faiz_development_common
# Conflicts:
#	lib/widgets/dropdown/dropdow_field.dart
1 year ago
Faiz Hashmi f7356592a0 Minor Fixes 1 year ago
Aamir Muhammad 03ccb1a60c Merge branch 'refs/heads/master' into aamir_dev 1 year ago
Aamir Muhammad 2eb1f22a24 CMA-458, CMA-455, CMA-434, CMA-247, CMA-343 1 year ago
Faiz Hashmi b8e0304a94 Minor Fixes 1 year ago
Faiz Hashmi a1d7dcab13 Minor Fixes 1 year ago
Faiz Hashmi e51df0651c Check appointmnet filter for provider 1 year ago
Faiz Hashmi 04bcf76083 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/service_view_model.dart
1 year ago
Faiz Hashmi 70870f1903 added lazy loading 1 year ago
Aamir aaa8f68e60 fixes 1 year ago
faizatflutter 803e81dbc9 Added Services Widget on HomeScreen 1 year ago
Faiz Hashmi 30cffc364b addnew service fix 1 year ago
Faiz Hashmi 98b6e03678 Duration Discount 1 year ago
Faiz Hashmi 30fc25c236 Duration Discount 1 year ago
Aamir 671b9d9e6f CMA 244 1 year ago
Aamir c8e1f6d756 Merge branch 'faiz_development_common' into aamir_dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/classes/consts.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	pubspec.yaml
1 year ago
Faiz Hashmi e79af29c8e Dropped the JIRA Count to 18 1 year ago
Faiz Hashmi d1fe3163f3 Dropped the JIRA Count to 23 1 year ago
Faiz Hashmi 892f52ced8 Fixing JIRA Issues 1 year ago
Faiz Hashmi c7446a91b3 Fixing JIRA Issues 1 year ago
Faiz Hashmi 7326886660 Fixing JIRA Issues 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
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
Faiz Hashmi ee4e7a7c2b Bug Fixed 1 year ago
Aamir 327f9d41b7 changes 1 year ago
Aamir 8d9c4091fb Merge branch 'faiz_development_common' into master_new_changes
# Conflicts:
#	lib/classes/app_state.dart
#	lib/services/payments_service.dart
#	lib/view_models/payment_view_model.dart
#	lib/view_models/service_view_model.dart
#	lib/views/setting_options/setting_options_more.dart
#	lib/views/user/login_with_password_page.dart
1 year ago
Aamir c1b01c1565 changes 1 year ago
Faiz Hashmi 6e74801852 Added Settings Modules 1 year ago
Faiz Hashmi 450dfff6e8 Added Shipping Management 1 year ago
Faiz Hashmi fb41cd0770 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 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 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