mosazaid
|
98f660e29b
|
Merge branch 'pharmacy' 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/core/service/client/base_app_client.dart
lib/locator.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
mosazaid
|
4e5d6a9a00
|
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
|
4 years ago |
 umasoodch
|
0431eb1ac8
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
|
4 years ago |
Fatimah Alshammari
|
d328c74fc4
|
fix order and orderdetails
|
4 years ago |
Mohammad Aljammal
|
0d098def04
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
Conflicts:
assets/app_icons/config.json
assets/app_icons/fonts/DQIcons.ttf
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/d_q_icons_icons.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/uitl/utils.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
Mohammad Aljmma
|
59defa4532
|
fix issue #15
|
4 years ago |
|
Fatimah Alshammari
|
ddf032bb47
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# android/app/build.gradle
# android/app/src/main/AndroidManifest.xml
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Fatimah Alshammari
|
f137bd44c0
|
created order and order details UI pages
|
4 years ago |
Elham Rababah
|
5bd3c7d9ce
|
finish step from notifications_page and create notification_details_page
|
4 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
|
4 years ago |
|
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
4 years ago |
|
Mohammad Aljmma
|
d4be20b07b
|
add icons
|
4 years ago |
|
Mohammad Aljmma
|
89cfcd3cad
|
fix design 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 |
Mohammad Aljammal
|
94c25d2188
|
Merge branch 'loader' into 'diplomatic-quarter-live'
Loader
See merge request Cloud_Solution/diplomatic-quarter!84
|
4 years ago |
haroon amjad
|
d5118bda11
|
Login / Register UI fixes
|
4 years ago |
|
Elham Rababah
|
cd7c354458
|
loader first step
|
4 years ago |
|
haroon amjad
|
3ae6df1dcb
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-live
|
4 years ago |
|
haroon amjad
|
6a630f6d33
|
logo & colors changed for login & registration flow
|
4 years ago |
Sultan Khan
|
deb828b4dd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljmma
|
1cf4797d4f
|
add font
|
4 years ago |
|
Mohammad Aljmma
|
26cf849f2b
|
hot fixing
|
4 years ago |
|
haroon amjad
|
0b6cd845f1
|
implementing Smart Watch Integration
|
4 years ago |
|
Fatimah Alshammari
|
1e00b9a4d8
|
added my-profile
|
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 |
|
Sultan Khan
|
f03a711dff
|
symptom checker gender page updated
|
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 |
|
Sultan Khan
|
d0d262f139
|
robot icon updates
|
4 years ago |
|
Sultan Khan
|
3ad928902b
|
voice command
|
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 |
|
Mohammad Aljammal
|
847ccb9c07
|
Merge branch 'child_vaccines' into 'master'
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!62
|
4 years ago |
|
Sultan Khan
|
83bc2cddce
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 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
|
4 years ago |
|
hussam al-habibeh
|
dbda69baa1
|
health Calculator'General Health'
|
4 years ago |
Amjad amireh
|
e14d619edd
|
child Vaccines
|
4 years ago |
|
Elham Rababah
|
293c557b54
|
First step from Home health care service
|
4 years ago |
|
Sultan Khan
|
ea86e88e2e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
5c859034d6
|
voice search
|
4 years ago |
|
Mohammad Aljammal
|
0d12210116
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
|
4 years ago |
|
Mohammad Aljammal
|
ac871bb416
|
Merge branch 'Blood_Donation' into 'master'
Blood donation
See merge request Cloud_Solution/diplomatic-quarter!58
|
4 years ago |
|
Mohammad Aljammal
|
f543126152
|
Ambulance Service
|
4 years ago |
|
haroon amjad
|
929e289a6f
|
started implementing Covid-19 DriveThru Test Module
|
4 years ago |
|
Amjad amireh
|
5e50c0dc32
|
Blood Denote
|
4 years ago |
|
Mohammad Aljammal
|
3946f0355c
|
Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/landing/landing_page.dart
|
4 years ago |
|
Mohammad Aljammal
|
d6a27a8e28
|
change medical profile icons
|
4 years ago |