Commit Graph

104 Commits (e2a5bbfb65e0abc03f6eb61baa2da355460ef761)

Author SHA1 Message Date
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
1 year ago
Faiz Hashmi 9b50be3b05 Debugging changes for request management chat 1 year ago
Aamir.Muhammad b4a3819c36 subscription & profile 1 year ago
Aamir.Muhammad cb04d4a2fb arabic fonts, logout, subscription app state. 2 years ago
Aamir.Muhammad cd97cbda78 Merge branch 'refs/heads/master' into localization_aamir 2 years ago
Aamir.Muhammad 13c28a14f1 appointment slider & subscription fix 2 years ago
Faiz Hashmi 7f0df61ff0 Merge branch 'localization_aamir' into faiz_development_common 2 years ago
Aamir.Muhammad 77d08afd0d Localization 1.1 2 years ago
Faiz Hashmi de3b37873a removed provider check on register_selection_page.dart 2 years ago
Faiz Hashmi e699b8f4a6 Merge branch 'localization_aamir' into faiz_development_common
# Conflicts:
#	lib/views/advertisement/ads_filter_view.dart
2 years ago
Aamir.Muhammad 9d1e463281 Login Skip 2 years ago
Aamir.Muhammad 201cbd185c Localization 2 years ago
Aamir.Muhammad 2e9d665aaf Localization 2 years ago
Aamir.Muhammad 4abcd4efe3 Localization 2 years ago
Faiz Hashmi b1f8ffab53 Merge remote-tracking branch 'origin/localization_aamir' into faiz_development_common 2 years ago
Faiz Hashmi 2804003472 Ad Change 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
Faiz Hashmi 08cb3f4a85 Merge branch 'aamir_dev' into faiz_development_common 2 years ago
Faiz Hashmi ca49b99f40 Aded AdTitke Flexiuvble 2 years ago
Aamir.Muhammad 926f083e7f models updates & created edit add methods 2 years ago
Aamir.Muhammad 603fa08c42 Merge branch 'master' into aamir_dev
# Conflicts:
#	lib/api/api_client.dart
2 years ago
Aamir.Muhammad 06f11e623b ads schedular & comments 2 years ago
Faiz Hashmi 8dbf04f7c9 added adID 2 years ago
Faiz Hashmi 81b18659d7 Bug Fixes 2 years ago
Aamir.Muhammad 3ca0b9776b Biometric Auth 2 years ago
Aamir.Muhammad 7ab427e113 Merge branch 'faiz_development_common' into aamir_dev 2 years ago
Aamir.Muhammad 0b073b23fa Merge remote-tracking branch 'origin/faiz_development_common' into aamir_dev
# Conflicts:
#	pubspec.lock
2 years ago
Aamir.Muhammad cec6d171e0 Biometric Auth 2 years ago
Faiz Hashmi f874e1fcb0 Added Ads Filter 2 years ago
Faiz Hashmi 69fc3346c6 Added Ads Filter and Appointments Filter 2 years ago
Faiz Hashmi 55c3af0540 Added Branch FilterView and their API integrations 2 years ago
Faiz Hashmi 342d9b2672 Added Branch FilterView 2 years ago
Faiz Hashmi 7c84037601 Merge branch 'faiz_development_common' 2 years ago
Mirza.Shafique@cloudsolutions.com.sa d5745847bf subscription updates 2 years ago
Faiz Hashmi d375b9dff3 Reservation Deal Completion WIP 2 years ago
Mirza.Shafique@cloudsolutions.com.sa 20125d81ae Merge branch 'master' into mirza_development
# Conflicts:
#	pubspec.lock
2 years ago
Faiz Hashmi e154d6e187 Added Account Screens as per new Design Syntax Fixed 2 years ago
Faiz Hashmi f970e4a540 Added Account Screens as per new Design 2 years ago
Mirza.Shafique@cloudsolutions.com.sa 9e38eee149 Fix 1.0 2 years ago
FaizHashmiCS22 6c416ef7a0 Appointment Flow Testing 2 years ago
FaizHashmiCS22 3f7527f4b2 Appointment Flow Testing 2 years ago
Faiz Hashmi d029656866 debugging changes 2 years ago
FaizHashmiCS22 dc145661c8 chat debugging changes 2 years ago