Commit Graph

279 Commits (967306f75dae7c50005a4d5a63ffcf8f23f989c7)
 

Author SHA1 Message Date
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
Aamir cef48cb1cb CMA 246, 247 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 7ab3caa364 CMA 246, 247 1 year ago
Aamir d4ebcf998f changes 1 year ago
Aamir 900d32f5bb 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 d414327147 Upgraded to latest 1 year ago
Faiz Hashmi 485285a147 Merge remote-tracking branch 'origin/faiz_development_common' into faiz_development_common 1 year ago
Faiz Hashmi 4c7b289d7e Bug Fixes 1 year ago
FaizHashmiCS22 462c8fa104 Merge remote-tracking branch 'origin/faiz_development_common' into faiz_development_common 1 year ago
FaizHashmiCS22 043e187274 Appointment Flow Testing 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 283c0e9d5a Fixed warranty years 1 year ago
Faiz Hashmi ee4e7a7c2b Bug Fixed 1 year ago
Faiz Hashmi c99878f04a Issues Fixed 1 year ago
Aamir cfd19346b8 Merge branch 'master' into master_new_changes 1 year ago
Aamir 327f9d41b7 changes 1 year ago
Faiz Hashmi b18b57ca93 bug fixes 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 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 fb41cd0770 FixedThings Before QA 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