Commit Graph

1264 Commits (39daaa16a71de58d672096b8e61af8d7fbc8a591)
 

Author SHA1 Message Date
Mohammad Aljammal 1968eb4682 return privilege 4 years ago
Mohammad Aljammal 952e106531 return privilege 4 years ago
Mohammad Aljammal f77d2b497e fix issues 4 years ago
Mohammad Aljammal 18dad434a0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
 Conflicts:
	lib/config/config.dart
	lib/core/service/client/base_app_client.dart
	lib/core/service/weather_service.dart
	lib/core/viewModels/dashboard_view_model.dart
	lib/main.dart
	lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
	lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
	lib/pages/BookAppointment/Search.dart
	lib/pages/ErService/AmbulanceReq.dart
	lib/pages/MyAppointments/widgets/AppointmentCardView.dart
	lib/pages/ToDoList/ToDo.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/login/login.dart
	lib/pages/login/register.dart
	lib/pages/medical/allergies_page.dart
	lib/pages/medical/balance/advance_payment_page.dart
	lib/pages/medical/doctor/doctor_home_page.dart
	lib/pages/medical/medical_profile_page.dart
	lib/pages/medical/prescriptions/prescriptions_home_page.dart
	lib/pages/medical/vital_sign/vital_sign_details_screen.dart
	lib/uitl/location_util.dart
	lib/widgets/drawer/app_drawer_widget.dart
	pubspec.yaml
4 years ago
enadhilal 10734d5994 connecting pages.
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
4 years ago
Mohammad Aljammal 4f59bd38df Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
hot fixing

See merge request Cloud_Solution/diplomatic-quarter!223
4 years ago
Mohammad Aljammal 6bda03e935 hot fixing 4 years ago
Mohammad Aljammal 0f3de39aba Merge branch 'sultan' into 'diplomatic-quarter-live'
dashboard issue fixed

See merge request Cloud_Solution/diplomatic-quarter!222
4 years ago
Sultan Khan e6a94f8014 login design 4 years ago
Sultan Khan b992978af4 login 4 years ago
Sultan Khan 764e706000 dashboard issue fixed 4 years ago
Mohammad Aljammal 8ac3bc71dc Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!221
4 years ago
Sultan Khan c01246acf0 hot fix 4 years ago
Sultan Khan 2b48578e07 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 016dffcb87 change 4 years ago
Mohammad Aljammal 6ffaa85864 Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
fix last vital sign data

See merge request Cloud_Solution/diplomatic-quarter!220
4 years ago
Mohammad Aljammal 4263672f00 fim last vital sign data 4 years ago
Mohammad Aljammal 80da19555c Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!218
4 years ago
Mohammad Aljammal 519a474d41 fix live care label and vital sign data 4 years ago
Fatimah Alshammari c0920e7099 Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
#	lib/widgets/pharmacy/product_tile.dart
4 years ago
Fatimah Alshammari 5fa5e9b7c8 fixed orders and profile 4 years ago
Mohammad Aljammal 5e3f6363cf fix issues 4 years ago
Mohammad Aljammal 85a8bdf55b Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!217
4 years ago
Mohammad Aljammal 754e60eb72 fix send email lab result 4 years ago
Sultan Khan 6b4bae7370 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 827768e96d language change 4 years ago
Mohammad Aljammal eb459010a9 Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
change the info images

See merge request Cloud_Solution/diplomatic-quarter!216
4 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 4 years ago
Zohaib Kambrani f03adb37ce no message 4 years ago
Mohammad Aljammal 5c8e43c163 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixes 4 years ago
Mohammad Aljammal 2553b032dd Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!215
4 years ago
Sultan Khan 8becd4f920 login issue fixed 4 years ago
Sultan Khan 3edae19ad6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan c9538c6a84 family files 4 years ago
Zohaib Kambrani 57925e3b02 Geofence fixes by JobScheduler 4 years ago
Mohammad Aljammal 33c61afd2a add powered by 4 years ago
Mohammad Aljammal 4204abdddc Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
fix issues insurance and medical profile order

See merge request Cloud_Solution/diplomatic-quarter!214
4 years ago
Mohammad Aljammal 5e29dff448 fix issues insurance and medical profile order 4 years ago
Mohammad Aljammal 50b5886b9f Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!213
4 years ago
Sultan Khan 355286768a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 73c8e00852 bug fixes 4 years ago
Mohammad Aljammal 493c62cd99 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
updates & fixes

See merge request Cloud_Solution/diplomatic-quarter!212
4 years ago
Haroon Amjad b0ea1fc262 updates & fixes 4 years ago
Mohammad Aljammal b326b0324e Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!211
4 years ago
Sultan Khan 18f492e52f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan d53031b0e6 blood type update for family files 4 years ago
Mohammad Aljammal bffafa65d1 Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!210
4 years ago
Mohammad Aljammal b9958acd53 fix issues 4 years ago
Mohammad Aljammal 2059b76fc1 fix Medical profile 4 years ago
Mohammad Aljammal 2d9ade7a5e Merge branch 'hot_fixes' into 'diplomatic-quarter-live'
Hot fixes

See merge request Cloud_Solution/diplomatic-quarter!209
4 years ago