Commit Graph

156 Commits (71de9c5c8e0dfbf0ee8d48184bf43aec6db39a64)

Author SHA1 Message Date
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 d8f14ff21f 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 2 years ago
Aamir.Muhammad 7084261352 Merge branch 'refs/heads/master' into aamir_dev
# Conflicts:
#	lib/view_models/dashboard_view_model.dart
2 years ago
Aamir.Muhammad 4c93da321e Merge branch 'refs/heads/master' into aamir_dev 2 years ago
Aamir.Muhammad 339cab78d2 Subscriptions & changes & limits checks 2 years ago
Faiz Hashmi 272dfe06f4 Added Firebase and Notifications 2 years ago
Faiz Hashmi 718cc75d13 Merge branch 'aamir_dev' into faiz_dev 2 years ago
Faiz Hashmi 16788bf9b2 added getTimeAgo on request page 2 years ago
Aamir.Muhammad 8b32b53983 Subscriptions 2 years ago
Aamir.Muhammad b78aeb8002 fixes 2 years ago
Aamir.Muhammad dbd6194441 Localization 2 years ago
Aamir.Muhammad 4b4bfc7930 Localization 2 years ago
Aamir.Muhammad bd3f25ad57 Localization 2 years 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
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 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 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 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
devshafique d778f7c52e model classes renamed 2 years ago
Faiz Hashmi b00b93a7ab chat module 2 years ago
Faiz Hashmi 8235f0b8af refined models 2 years ago
Faiz Hashmi 221b481114 refined models 2 years ago
devshafique 377f285c20 request management and merge conflicts fixed 1.0 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 01dd0cfcb4 GIT TEA Test 3 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 4e78e6fdc1 subscriptions design phase 2 3 years ago
mirza.shafique 4b58a4f2dc Phase 2 design (Book appointments, Requests) 3 years ago
mirza.shafique 521d9f4edd New UI Implemented Fix 3 Phase 1 3 years ago
mirza.shafique 8fea020fc8 New UI Implemented Fix 2 3 years ago
devmirza121 a2d12db77d New UI Implemented Fix 1.2 3 years ago
devmirza121 3c257868eb New UI Implemented Fix 1.1 4 years ago
devmirza121 3f6e3f1423 New UI Implemented Fix 1.0 4 years ago
devmirza121 3b6eb17adc New UI Implemented arabic check 4 years ago
devmirza121 0f185d4f8d New UI Implemented 4 years ago
devmirza121 4a8c27821c Issue's fixes 4 years ago
devmirza121 4b8422617f Merge branch 'fatima' into mirza_dev
# Conflicts:
#	lib/pages/dashboard/dashboard_page.dart
#	lib/pages/settings/define_branch_page.dart
#	lib/pages/settings/define_license_page.dart
#	lib/pages/user/complete_profile_page.dart
#	lib/pages/user/edit_account_page.dart
#	lib/pages/user/forget_password_page.dart
#	lib/pages/user/login_with_password_page.dart
#	lib/pages/user/register_page.dart
4 years ago
devmirza121 96c2ff3f39 CMA #67 & #65 fixed 1.0 4 years ago
Fatimah Alshammari 44f2868790 fix issues 4 years ago
Fatimah Alshammari 3dc5da827d fix issues 4 years ago
Fatimah Alshammari 9ad439fb46 fix issues 4 years ago
Fatimah Alshammari c1e06a739a fix issues 4 years ago
devmirza121 b385dccefd CMA #67 & #65 fixed 4 years ago
devmirza121 0aa90578ef Merge branch 'fatima' into mirza_dev 4 years ago
devmirza121 c3dc3bb21c User Image fix 4 years ago
Fatimah Alshammari 5c0aa4074c fix issues 4 years ago
devmirza121 66438f3d48 Merge branch 'fatima' into mirza_dev
# Conflicts:
#	lib/api/client/user_api_client.dart
#	lib/pages/user/complete_profile_page.dart
4 years ago
Fatimah Alshammari a1dbfd0caa Merge remote-tracking branch 'origin/fatima' into fatima
# Conflicts:
#	lib/pages/user/login_with_password_page.dart
4 years ago
devmirza121 305d5e97dd Tab fix's on login 1.0 4 years ago
Fatimah Alshammari 6ff81c47b5 fix issues 4 years ago
devmirza121 34866123bf Tab fix's on login 4 years ago
Fatimah Alshammari 4f17e7f22b Merge remote-tracking branch 'origin/fatima' into fatima
# Conflicts:
#	lib/api/client/user_api_client.dart
#	lib/classes/consts.dart
4 years ago
Fatimah Alshammari c898ad5985 verify email 4 years ago
devmirza121 89ffa6c110 Verify email 4 years ago
devmirza121 6f3303b5ff Merge branch 'fatima' of https://gitlab.com/mirza.shafique/car_provider_app into fatima
 Conflicts:
	lib/classes/consts.dart
4 years ago
devmirza121 d9b4f8316f Otp Dialog fix 4 years ago
Fatimah Alshammari 6631661852 fixed issues 4 years ago
Fatimah Alshammari 3467d005b1 fixed issues 4 years ago
Fatimah Alshammari 0de7d3bcb5 Merge branch 'fatima' of https://gitlab.com/mirza.shafique/car_provider_app into fatima
 Conflicts:
	lib/api/client/user_api_client.dart
	lib/pages/user/change_password_page.dart
4 years ago
Fatimah Alshammari 5b8750702e fixed issues 4 years ago
devmirza121 44475599da Forget Password issue fixed 4 years ago
Fatimah Alshammari 47f10738d7 fixed issues 4 years ago
Fatimah Alshammari 7921ffe26d fixed validation 4 years ago
devmirza121 3d5ba9d995 Merge branch 'fatima' 4 years ago
devmirza121 2e44f4170d Phase 1 API's complition 1.1 4 years ago
Fatimah Alshammari b9798fc014 Merge remote-tracking branch 'origin/fatima' into fatima 4 years ago
Fatimah Alshammari db4df07000 added confirm password 4 years ago
devmirza121 3a9dfbdc0b Phase 1 API's complition 1.1 4 years ago
devmirza121 f382f91a4d Phase 1 API's complition 1.0 4 years ago
devmirza121 c8ad04a123 Merge branch 'master' into fatima
# Conflicts:
#	lib/api/client/user_api_client.dart
#	lib/classes/consts.dart
#	lib/config/routes.dart
4 years ago
devmirza121 1e16bb3635 Phase 1 API's complition 4 years ago
Fatimah Alshammari 39b6f06ca8 1.1 4 years ago
devmirza121 9591eca23c API's Modifications 1.4 4 years ago
devmirza121 37f8142c0f API's Modifications 1.3 4 years ago