Commit Graph

28 Commits (ba2d2f66655bc96e7cd03df7e1fba9f13e836670)

Author SHA1 Message Date
Faiz Hashmi 96a96900ef Branches Fix 1 year ago
Faiz Hashmi 46839624c7 Name Refactoring 1 year ago
Faiz Hashmi 272760bad3 Merge remote-tracking branch 'origin/faiz_dev' into faiz_development
# Conflicts:
#	lib/view_models/dashboard_view_model.dart
1 year ago
Faiz Hashmi 5e80bf6eb2 Merge branch 'aamir_dev' into faiz_development
# Conflicts:
#	lib/view_models/dashboard_view_model.dart
#	lib/views/dashboard/dashboard_page.dart
#	lib/views/settings/branch/branch_list_page.dart
1 year ago
Faiz Hashmi 7eeb3ed208 Updated both apps' structure 1 year ago
Aamir.Muhammad 844afe2605 changes 1 year ago
Aamir.Muhammad 7084261352 Merge branch 'refs/heads/master' into aamir_dev
# Conflicts:
#	lib/view_models/dashboard_view_model.dart
1 year ago
Aamir.Muhammad 339cab78d2 Subscriptions & changes & limits checks 1 year ago
Faiz Hashmi 272dfe06f4 Added Firebase and Notifications 1 year ago
Aamir.Muhammad 461a3a166e Localization 2 years ago
Aamir.Muhammad 5d920c8e89 Localization 2 years ago
Aamir.Muhammad 3b35288c9d user profile 7 api's & fixes 2 years ago
Aamir.Muhammad 79d1f37b12 changes & updates 2 years ago
Faiz Hashmi a25ec69694 Code Refactoring 2 years ago
Faiz Hashmi 93cca6425f Refactored Code 2 years ago
Mirza.Shafique@cloudsolutions.com.sa 9824303de1 subscription 3.0 2 years ago
Mirza.Shafique@cloudsolutions.com.sa be15a74274 subscription 1.0 2 years ago
Mirza.Shafique@cloudsolutions.com.sa 9c190bd730 small changes based on the services 2 years ago
Mirza.Shafique@cloudsolutions.com.sa 501cd60814 Merge branch 'master' into mirza_dev
# Conflicts:
#	android/build.gradle
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/config/provider_routes.dart
#	lib/main.dart
#	lib/repositories/branch_repo.dart
#	lib/repositories/items_repo.dart
#	lib/repositories/subscription_repo.dart
#	lib/view_models/service_view_model.dart
#	lib/views/dashboard/dashboard_page.dart
#	lib/views/dashboard/fragments/home_fragment.dart
#	lib/views/dashboard/fragments/request_list_fragment.dart
#	lib/views/settings/branch/branch_detail_page.dart
#	lib/views/settings/branch/define_branch_page.dart
#	lib/views/settings/services/create_item_page.dart
#	pubspec.lock
2 years ago
Mirza.Shafique@cloudsolutions.com.sa b437bf4c91 Appointment Implementation 2 years ago
devshafique d778f7c52e model classes renamed 2 years ago
Faiz Hashmi 8235f0b8af refined models 2 years ago
Faiz Hashmi 221b481114 refined models 2 years ago
devshafique 1df4800f2d request management and merge conflicts fixed 2 years ago
devshafique 5727836f3a Provider Dealer User Implemented 2 years ago
mirza.shafique 1a9d61ac62 add services and items 1 3 years ago
mirza.shafique d6f3c5653a add services and items 3 years ago
mirza.shafique 4b58a4f2dc Phase 2 design (Book appointments, Requests) 3 years ago