Commit Graph

114 Commits (5e80bf6eb2a9795e9a631d5d9941ef0d298cd81d)
 

Author SHA1 Message Date
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 03024052c2 Added Damage Pictures in ad_detail_view and extend edit ad 1 year ago
Faiz Hashmi 795cab9579 Added Damage Pictures in ad_detail_view and extend edit ad 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 4c93da321e Merge branch 'refs/heads/master' into aamir_dev 1 year ago
Aamir.Muhammad 339cab78d2 Subscriptions & changes & limits checks 1 year ago
Faiz Hashmi 272dfe06f4 Added Firebase and Notifications 1 year ago
Faiz Hashmi 4c6a7f51c6 path: /Volumes/Data/Projects/Flutter/car_common_app
added
1 year ago
Faiz Hashmi 718cc75d13 Merge branch 'aamir_dev' into faiz_dev 1 year ago
Faiz Hashmi 16788bf9b2 added getTimeAgo on request page 1 year ago
Aamir.Muhammad 8b32b53983 Subscriptions 1 year ago
Aamir.Muhammad b78aeb8002 fixes 1 year ago
Aamir.Muhammad 986a41c504 Merge branch 'refs/heads/master' into aamir_dev 1 year ago
Aamir.Muhammad dbd6194441 Localization 1 year ago
Faiz Hashmi ba2751806b pasth 1 year ago
Aamir.Muhammad 4b4bfc7930 Localization 1 year ago
Aamir.Muhammad bd3f25ad57 Localization 1 year ago
Aamir.Muhammad 461a3a166e Localization 1 year ago
Aamir.Muhammad 5d920c8e89 Localization 1 year ago
Aamir.Muhammad 3b35288c9d user profile 7 api's & fixes 1 year ago
Aamir.Muhammad 79d1f37b12 changes & updates 1 year ago
Aamir.Muhammad c5edccb71f Define branch fix 2 years ago
Faiz Hashmi 3834fdbf2e Code Refactoring 2 years ago
Faiz Hashmi a25ec69694 Code Refactoring 2 years ago
Faiz Hashmi 082cd766a5 Refactored Code 2 years ago
Faiz Hashmi 93cca6425f Refactored Code 2 years ago
Faiz Hashmi 1333895a02 Latest code 2 years ago
Faiz Hashmi 0599bed068 Merge branch 'mirza_dev' of http://34.17.52.79/Haroon6138/car_provider_app into faiz_dev
# Conflicts:
#	lib/views/dashboard/fragments/ads_fragment.dart
#	pubspec.lock
2 years ago
Mirza.Shafique@cloudsolutions.com.sa 178789fa38 subscription 4.0 2 years ago
Mirza.Shafique@cloudsolutions.com.sa 9824303de1 subscription 3.0 2 years ago
Mirza.Shafique@cloudsolutions.com.sa ed2a1eedc6 subscription 2.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
FaizHashmiCS22 2859d33f55 pushing from windows 2 years ago
Faiz Hashmi 9c8e4549cb Test Changes 2 years ago
FaizHashmiCS22 73fbc6c58a Merge remote-tracking branch 'origin/faiz_dev' into faiz_dev
# Conflicts:
#	pubspec.lock
#	pubspec.yaml
2 years ago
FaizHashmiCS22 4f91c03913 merge changes 2 years ago
Mirza.Shafique@cloudsolutions.com.sa e67701d132 merging changes 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 1af42fdcf7 path fix 2 years ago
Mirza.Shafique@cloudsolutions.com.sa eab65fc617 Appointment Implementation 1.2 2 years ago
Mirza.Shafique@cloudsolutions.com.sa e4e1b0a3c4 Appointment Implementation 1.1 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
Mirza.Shafique@cloudsolutions.com.sa ef7b24781e gradle fix 2 years ago
devshafique d778f7c52e model classes renamed 2 years ago
Faiz Hashmi b00b93a7ab chat module 2 years ago
Faiz Hashmi 8235f0b8af refined models 2 years ago