Mohammad Aljmma
|
5e8b61bf2d
|
fix issue #13
|
4 years ago |
|
Mohammad Aljmma
|
a742f896be
|
fix issue#4
|
4 years ago |
|
Mohammad Aljmma
|
e1f6ef5e5b
|
fix Prescriptions history
|
4 years ago |
Sultan Khan
|
cced69502a
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
aa8f9f18e1
|
forgot password
|
4 years ago |
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
4 years ago |
|
Sultan Khan
|
4976870d2e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
875bf10c73
|
settings page added
|
4 years ago |
|
Mohammad Aljmma
|
6a83538544
|
add info for Medical
|
4 years ago |
Elham Rababah
|
64f970c40c
|
Fix issues after the merge
|
4 years ago |
|
Elham Rababah
|
5ed4d76a54
|
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Sultan Khan
|
0443a37886
|
register page updated
|
4 years ago |
|
Elham Rababah
|
5bd3c7d9ce
|
finish step from notifications_page and create notification_details_page
|
4 years ago |
|
Sultan Khan
|
d939b2ec9b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
f8e05fc447
|
regiter issue
|
4 years ago |
|
Elham Rababah
|
9f2beceb22
|
First step from notifications_page
|
4 years ago |
|
Mohammad Aljmma
|
e42f953bd1
|
fix prescription report issues
|
4 years ago |
|
haroon amjad
|
aeab57beab
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/main.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
|
haroon amjad
|
f5a2870fac
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
Implemented Badge count on ToDo list & my appointments
|
4 years ago |
|
Mohammad Aljmma
|
479aea4df8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljmma
|
d4be20b07b
|
add icons
|
4 years ago |
|
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
4 years ago |
|
haroon amjad
|
1553e71e7d
|
New loading dialog added into appointment flow
|
4 years ago |
|
Mohammad Aljmma
|
856ab52439
|
fix ui issues
|
4 years ago |
|
Mohammad Aljmma
|
894494ec4e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
ios/Flutter/.last_build_id
lib/main.dart
lib/pages/landing/home_page.dart
|
4 years ago |
|
Mohammad Aljmma
|
874de15040
|
change the home page design
|
4 years ago |
|
haroon amjad
|
d5118bda11
|
Login / Register UI fixes
|
4 years ago |
|
Sultan Khan
|
deb828b4dd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
50dffe9af9
|
Merge branch 'Haroon' into 'master'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!74
|
4 years ago |
|
Mohammad Aljmma
|
d0ed776ff6
|
new home health service
|
4 years ago |
|
haroon amjad
|
dfa7e0e02f
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
22ef24c4ff
|
Merge branch 'master' into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
|
4 years ago |
|
jammal
|
9328f942ba
|
done ER service
|
4 years ago |
|
jammal
|
7dc55f3378
|
Merge branch 'home_health_care' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ios_issues
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
jammal
|
bd2254491c
|
done ER service
|
4 years ago |
|
Sultan Khan
|
f03a711dff
|
symptom checker gender page updated
|
4 years ago |
|
haroon amjad
|
6b316bf262
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/config.dart
# lib/pages/AlHabibMedicalService/ health_calculators.dart
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
|
4 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
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
15ac74fadb
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
Conflicts:
lib/pages/AlHabibMedicalService/ health_calculators.dart
|
4 years ago |
|
Sultan Khan
|
8095e56b32
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Amjad amireh
|
83735ab68d
|
modified Child vaccintion note
|
4 years ago |
|
haroon amjad
|
a8ee7db62b
|
fixes
# Conflicts:
# lib/config/config.dart
|
4 years ago |
|
Mohammad Aljammal
|
84bb68789d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
Conflicts:
lib/config/config.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/ContactUs/findus/hospitrals_page.dart
lib/pages/ContactUs/findus/pharmacies_page.dart
|
4 years ago |
|
Mohammad Aljammal
|
06416b4934
|
add Not authenticated Page
|
4 years ago |
|
haroon amjad
|
5f36c900a4
|
fixes
|
4 years ago |
|
haroon amjad
|
0daa0dc683
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
|
Sultan Khan
|
da317431ba
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Elham Rababah
|
83ab1b4d61
|
fix issues in the services logic and add some translation
|
4 years ago |
|
Amjad amireh
|
67e3a13a95
|
child Vaccines add new child modified
|
4 years ago |