Commit Graph

69 Commits (7a93004fba7efd8af330ba63e2ee7816e4d7811d)

Author SHA1 Message Date
Aamir Muhammad 7a93004fba changes 1 year ago
Faiz Hashmi 8f8f19b35e Minor Fixes 1 year ago
Faiz Hashmi a1d7dcab13 Minor Fixes 1 year ago
Faiz Hashmi e51df0651c Check appointmnet filter for provider 1 year ago
Aamir aaa8f68e60 fixes 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 892f52ced8 Fixing JIRA Issues 1 year ago
Faiz Hashmi 7326886660 Fixing JIRA Issues 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
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
Faiz Hashmi 0d0597ae48 issues fixed 1 year ago
Faiz Hashmi ee4e7a7c2b Bug Fixed 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 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 f0a9c294c2 Fixed the notes list 1 year ago
Faiz Hashmi f290f2e04f Request Module Completed 1 year ago
Aamir.Muhammad 8fc14ee2bc fonts fixes & changes 1 year ago
Faiz Hashmi 31a9b71b83 Model Refactoring 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 9b50be3b05 Debugging changes for request management chat 2 years ago
Aamir.Muhammad fcd5436fb7 Localization 1 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 06f11e623b ads schedular & comments 2 years ago
Mirza.Shafique@cloudsolutions.com.sa d5745847bf subscription updates 2 years ago
Faiz Hashmi f970e4a540 Added Account Screens as per new Design 2 years ago
FaizHashmiCS22 3f7527f4b2 Appointment Flow Testing 2 years ago
Mirza.Shafique@cloudsolutions.com.sa a7ba63d281 Merge branch 'mirza_development'
# Conflicts:
#	lib/view_models/appointments_view_model.dart
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 98b35fbc61 Chat Module almost finished! 2 years ago
Faiz Hashmi 76fd46c654 models refinement 2 years ago
Faiz Hashmi b9a5429de5 Request Module iAP 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 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