Commit Graph

9 Commits (501cd60814d8e37485b61eabbabab2c65ad22ab1)

Author SHA1 Message Date
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 eab65fc617 Appointment Implementation 1.2 2 years ago
Mirza.Shafique@cloudsolutions.com.sa b437bf4c91 Appointment Implementation 2 years ago
Faiz Hashmi 37ec048a2c chat moDULE ANd other testing before demo 2 years ago
devshafique d778f7c52e model classes renamed 2 years ago
Faiz Hashmi 221b481114 refined models 2 years ago
devshafique 1df4800f2d request management and merge conflicts fixed 2 years ago
mirza.shafique 1a9d61ac62 add services and items 1 3 years ago
mirza.shafique 4b58a4f2dc Phase 2 design (Book appointments, Requests) 3 years ago