haroon amjad
|
94fb41581e
|
config update
|
5 years ago |
haroon amjad
|
9868a43e7b
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
|
5 years ago |
Mohammad Aljammal
|
a691186ec7
|
Merge branch 'pharmacy_module_feature_home_page' into 'master'
Pharmacy module feature home page
See merge request Cloud_Solution/diplomatic-quarter!96
|
5 years ago |
mosazaid
|
2095f2c62a
|
fix merge issue
|
5 years ago |
mosazaid
|
dade295656
|
fix merge issue
|
5 years ago |
mosazaid
|
11ff27bae3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
5 years ago |
mosazaid
|
9a169ff77b
|
finish home page and start working on order preview page
|
5 years ago |
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
5 years ago |
umasoodch
|
23083fd5ad
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Mohammad Aljammal
|
a9eb09c560
|
Merge branch 'sultan' into 'master'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!79
|
5 years ago |
Sultan Khan
|
deb828b4dd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
23b48485ed
|
voice command
|
5 years ago |
Mohammad Aljammal
|
bdb42e2704
|
Merge branch 'font' into 'master'
add font
See merge request Cloud_Solution/diplomatic-quarter!77
|
5 years ago |
Mohammad Aljmma
|
1cf4797d4f
|
add font
|
5 years ago |
Mohammad Aljammal
|
1323551bb1
|
Merge branch 'hot_fixing' into 'master'
hot fixing
See merge request Cloud_Solution/diplomatic-quarter!75
|
5 years ago |
Mohammad Aljmma
|
26cf849f2b
|
hot fixing
|
5 years ago |
Mohammad Aljammal
|
50dffe9af9
|
Merge branch 'Haroon' into 'master'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!74
|
5 years ago |
Mohammad Aljmma
|
d0ed776ff6
|
new home health service
|
5 years ago |
haroon amjad
|
dfa7e0e02f
|
updates & fixes
|
5 years ago |
haroon amjad
|
0b6cd845f1
|
implementing Smart Watch Integration
|
5 years ago |
haroon amjad
|
22ef24c4ff
|
Merge branch 'master' into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
|
5 years ago |
Mohammad Aljammal
|
9126934ef4
|
Merge branch 'er_location' into 'master'
Er location
See merge request Cloud_Solution/diplomatic-quarter!72
|
5 years ago |
jammal
|
9328f942ba
|
done ER service
|
5 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
|
5 years ago |
jammal
|
bd2254491c
|
done ER service
|
5 years ago |
enadhilal
|
613206f9d3
|
Merge branch 'enad_pharmacy2' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
enadhilal
|
5445cced89
|
Merge branch 'master' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Mohammad Aljammal
|
f604b0322a
|
Merge branch 'ios_issues' into 'master'
fix ios issues
See merge request Cloud_Solution/diplomatic-quarter!71
|
5 years ago |
jammal
|
57f938aa09
|
fix ios issues
|
5 years ago |
Mohammad Aljammal
|
d90a28aecf
|
Merge branch 'ios_issues' into 'master'
fix ios issues
See merge request Cloud_Solution/diplomatic-quarter!70
|
5 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
|
5 years ago |
jammal
|
0fceca8f3e
|
fix ios issues
|
5 years ago |
enadhilal
|
7ca6e6caa7
|
fix widget of product_tile
|
5 years ago |
enadhilal
|
d6d1c26c9a
|
add product_tile widget
|
5 years ago |
enadhilal
|
068382e76f
|
add call for backend service
|
5 years ago |
haroon amjad
|
68b0e3857a
|
updates
|
5 years ago |
Sultan Khan
|
f03a711dff
|
symptom checker gender page updated
|
5 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
|
5 years ago |
enadhilal
|
815bc39268
|
add wishlist page
|
5 years ago |
haroon amjad
|
7edb6fd179
|
UI Fixes in LiveCare
|
5 years ago |
Mohammad Aljammal
|
62efc13047
|
Merge branch 'sultan' into 'master'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!44
|
5 years ago |
Mohammad Aljammal
|
e025321c71
|
fix issues
|
5 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
|
5 years ago |
Mohammad Aljammal
|
c1b3b3bbbb
|
Merge branch 'my_trackers' into 'master'
My trackers
See merge request Cloud_Solution/diplomatic-quarter!68
|
5 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
|
5 years ago |
Mohammad Aljammal
|
e7cf452a79
|
Merge branch 'insurance' into 'master'
files import fix
See merge request Cloud_Solution/diplomatic-quarter!66
|
5 years ago |
Mohammad Aljammal
|
ecde0b450d
|
Merge branch 'haroon_s' into 'master'
Haroon s
See merge request Cloud_Solution/diplomatic-quarter!67
|
5 years ago |
Mohammad Aljammal
|
a31796322b
|
fix icons issue
|
5 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
|
5 years ago |
Mohammad Aljammal
|
53bbafdc2b
|
fix Authenticated User Object
|
5 years ago |