enadhilal
|
778e9fd8da
|
Merge branch 'pharmacy_module_feature_home_page' into enad_pharmacy2
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
4 years ago |
Mohammad Aljammal
|
9126934ef4
|
Merge branch 'er_location' into 'master'
Er location
See merge request Cloud_Solution/diplomatic-quarter!72
|
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 |
|
enadhilal
|
613206f9d3
|
Merge branch 'enad_pharmacy2' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
enadhilal
|
5445cced89
|
Merge branch 'master' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
Mohammad Aljammal
|
f604b0322a
|
Merge branch 'ios_issues' into 'master'
fix ios issues
See merge request Cloud_Solution/diplomatic-quarter!71
|
4 years ago |
|
jammal
|
57f938aa09
|
fix ios issues
|
4 years ago |
|
Mohammad Aljammal
|
d90a28aecf
|
Merge branch 'ios_issues' into 'master'
fix ios issues
See merge request Cloud_Solution/diplomatic-quarter!70
|
4 years ago |
|
enadhilal
|
bf88d84022
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into enad_pharmacy
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
jammal
|
0fceca8f3e
|
fix ios issues
|
4 years ago |
|
enadhilal
|
7ca6e6caa7
|
fix widget of product_tile
|
4 years ago |
|
enadhilal
|
d6d1c26c9a
|
add product_tile widget
|
4 years ago |
|
enadhilal
|
068382e76f
|
add call for backend service
|
4 years ago |
|
enadhilal
|
815bc39268
|
add wishlist page
|
4 years ago |
|
Mohammad Aljammal
|
62efc13047
|
Merge branch 'sultan' into 'master'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!44
|
4 years ago |
Mohammad Aljammal
|
e025321c71
|
fix issues
|
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
|
c1b3b3bbbb
|
Merge branch 'my_trackers' into 'master'
My trackers
See merge request Cloud_Solution/diplomatic-quarter!68
|
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
|
e7cf452a79
|
Merge branch 'insurance' into 'master'
files import fix
See merge request Cloud_Solution/diplomatic-quarter!66
|
4 years ago |
|
Mohammad Aljammal
|
ecde0b450d
|
Merge branch 'haroon_s' into 'master'
Haroon s
See merge request Cloud_Solution/diplomatic-quarter!67
|
4 years ago |
|
Mohammad Aljammal
|
a31796322b
|
fix icons issue
|
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 |
|
Mohammad Aljammal
|
53bbafdc2b
|
fix Authenticated User Object
|
4 years ago |
Sultan Khan
|
d0d262f139
|
robot icon updates
|
4 years ago |
hussam al-habibeh
|
cd36749e4e
|
files import fix
|
4 years ago |
Elham Rababah
|
c0a54c8cbc
|
remove commit
|
4 years ago |
|
Sultan Khan
|
8095e56b32
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
3ad928902b
|
voice command
|
4 years ago |
|
Elham Rababah
|
a359a6cd1a
|
fix the loader issue
|
4 years ago |
|
Mohammad Aljammal
|
b0fa7811e5
|
Merge branch 'insurance' into 'master'
women health
See merge request Cloud_Solution/diplomatic-quarter!65
|
4 years ago |
|
Mohammad Aljammal
|
39a4020b69
|
Merge branch 'child_vaccines' into 'master'
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!64
|
4 years ago |
|
hussam al-habibeh
|
c6a9b66538
|
women health
|
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 |
|
haroon amjad
|
41d50e23e3
|
covid drivethru implemented
|
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 |
|
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
|
8ddec0ad99
|
child Vaccines add new child modified
|
4 years ago |
|
Amjad amireh
|
67e3a13a95
|
child Vaccines add new child modified
|
4 years ago |
|
Elham Rababah
|
da7131015e
|
remove print statements
|
4 years ago |
|
Mohammad Aljammal
|
847ccb9c07
|
Merge branch 'child_vaccines' into 'master'
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!62
|
4 years ago |
|
Amjad amireh
|
cb2a78e2ee
|
child Vaccines
|
4 years ago |
|
Sultan Khan
|
7b6135a6c7
|
voice search
|
4 years ago |
|
Sultan Khan
|
83bc2cddce
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |