haroon amjad
|
709877b5f1
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/pages/login/forgot-password.dart
# lib/pages/medical/radiology/radiology_details_page.dart
|
5 years ago |
|
haroon amjad
|
90db04cee1
|
Jira Fixes
|
5 years ago |
Sultan Khan
|
23ca95b9b6
|
bug fixes
|
5 years ago |
Zohaib Iqbal Kambrani
|
4abdd9bde7
|
no message
|
5 years ago |
Elham Rababah
|
6e7f62ca21
|
PAP-612: show ok and cancel options
|
5 years ago |
|
Sultan Khan
|
66acce3b40
|
ancillary order pages added
|
5 years ago |
|
Sultan Khan
|
b891c1bd80
|
theme issue
|
5 years ago |
 Sikander Saleem
|
aef4c7bfac
|
H2O feature improvement
|
6 years ago |
|
Sikander Saleem
|
3b4e791017
|
H2O feature improvement
|
6 years ago |
mosazaid
|
f5d478fd27
|
re-design child vaccine and fix some funcrionalities
|
6 years ago |
Mohammad Aljammal
|
952e106531
|
return privilege
|
6 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
|
6 years ago |
|
Sultan Khan
|
040c8f38ab
|
hot fixes
|
6 years ago |
|
Mohammad Aljammal
|
a57d5eb69f
|
hot fixes
|
6 years ago |
|
haroon amjad
|
951d9b553f
|
fixes & updates
|
6 years ago |
|
haroon amjad
|
9d046fd971
|
updates & fixes
|
6 years ago |
|
Mohammad Aljammal
|
4e2c955b09
|
add missing translation
|
6 years ago |
|
Sultan Khan
|
d69b3676a4
|
weather indicator in progress
|
6 years ago |
|
Sultan Khan
|
81c8239412
|
bug fixes
|
6 years ago |
|
Sultan Khan
|
7d3c1ac852
|
weather indicator updated
|
6 years ago |
|
Sultan Khan
|
648d9d245d
|
health weather indicator
|
6 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
6 years ago |
Mohammad Aljmma
|
e42ebfbf64
|
fix issue #16
|
6 years ago |
|
Mohammad Aljmma
|
59defa4532
|
fix issue #15
|
6 years ago |
Elham Rababah
|
9f2beceb22
|
First step from notifications_page
|
6 years ago |
|
Mohammad Aljmma
|
f79d8eb8f9
|
fix login issues
|
6 years ago |
|
Mohammad Aljmma
|
e7e32a414b
|
fix barcode
|
6 years ago |
|
Sultan Khan
|
deb828b4dd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
6 years ago |
|
haroon amjad
|
dfa7e0e02f
|
updates & fixes
|
6 years ago |
|
Sultan Khan
|
f03a711dff
|
symptom checker gender page updated
|
6 years ago |
|
Mohammad Aljammal
|
29f0402cbd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
Conflicts:
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/pages/AlHabibMedicalService/ health_calculators.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/services/appointment_services/GetDoctorsList.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
6 years ago |
|
Mohammad Aljammal
|
d3d0fa00e7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
Conflicts:
lib/pages/landing/home_page.dart
|
6 years ago |
|
Mohammad Aljammal
|
53bbafdc2b
|
fix Authenticated User Object
|
6 years ago |
|
Sultan Khan
|
da317431ba
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
6 years ago |
Mohammad Aljammal
|
847ccb9c07
|
Merge branch 'child_vaccines' into 'master'
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!62
|
6 years ago |
|
Sultan Khan
|
83bc2cddce
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
6 years ago |
hussam al-habibeh
|
84f429e559
|
merge
|
6 years ago |
|
hussam al-habibeh
|
bafcc4331e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
Conflicts:
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
pubspec.yaml
|
6 years ago |
|
hussam al-habibeh
|
dbda69baa1
|
health Calculator'General Health'
|
6 years ago |
|
Sultan Khan
|
ea86e88e2e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
6 years ago |
|
Sultan Khan
|
5c859034d6
|
voice search
|
6 years ago |
Amjad amireh
|
42fd2e0eee
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into child_vaccines
Conflicts:
lib/core/viewModels/base_view_model.dart
|
6 years ago |
|
Amjad amireh
|
98947d5f6b
|
Blood Denote
|
6 years ago |
|
Elham Rababah
|
0a60b27ab4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
Conflicts:
lib/locator.dart
|
6 years ago |
|
Mohammad Aljammal
|
ac871bb416
|
Merge branch 'Blood_Donation' into 'master'
Blood donation
See merge request Cloud_Solution/diplomatic-quarter!58
|
6 years ago |
|
Elham Rababah
|
dd76ae05a7
|
fix H2O page issue
|
6 years ago |
|
Amjad amireh
|
5e50c0dc32
|
Blood Denote
|
6 years ago |
|
Mohammad Aljammal
|
020d10fccc
|
Merge branch 'insurance' into 'master'
Health Converter
See merge request Cloud_Solution/diplomatic-quarter!56
|
6 years ago |
|
Elham Rababah
|
c994c39c6b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
|
6 years ago |
|
Elham Rababah
|
91a8b94382
|
Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/landing_page.dart
|
6 years ago |