Fatimah Alshammari
174e0d9673
Merge branch 'development' into pharmacy-Fatima
5 years ago
Fatimah Alshammari
2481e4c9ea
fixed categories issues and home page button
5 years ago
Sultan Khan
8c9c309abb
bug fixes
5 years ago
haroon amjad
353a5157f2
fixes
5 years ago
Sultan Khan
3d6858d0ec
bug fixes
5 years ago
haroon amjad
f754e48034
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
haroon amjad
49c454b132
fixes
5 years ago
mosazaid
b623bd0dce
Merge branch 'development' into fix_bugs
5 years ago
mosazaid
e5474b3062
fix perscription pages bugs
5 years ago
Zohaib Iqbal Kambrani
b91ce441e2
Merge branch 'development' into ZohaibIqbalKambrani
...
# Conflicts: Resolved
# lib/core/model/pharmacies/order_model.dart
# lib/core/service/client/base_app_client.dart
# lib/main.dart
# lib/pages/landing/home_page.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/order/TrackDriver.dart
# lib/routes.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
5 years ago
haroon amjad
9c1fdf96f4
Merge branch 'development' into Haroon
5 years ago
haroon amjad
33e1bf8103
Jira fixes
5 years ago
haroon amjad
accc39d972
jira bug fixes
5 years ago
Sultan Khan
ca2a48e860
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
0445011e53
bug fixes
5 years ago
Mohammad Aljammal
ad88f6de04
fix theme issues
5 years ago
haroon amjad
454957ebba
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
5 years ago
Sultan Khan
616212828d
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
66acce3b40
ancillary order pages added
5 years ago
haroon amjad
e0ebb922ed
pharmacy fixes
5 years ago
Zohaib Iqbal Kambrani
f410ce20ca
Packages and Offers in Progress
5 years ago
haroon amjad
ed3dba3eb3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
b9a12341d5
updates & fixes
5 years ago
Mohammad Aljammal
861dba9a94
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
ec401d4848
Done Ed online
5 years ago
Sultan Khan
a6196d3c30
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
b891c1bd80
theme issue
5 years ago
Fatimah Alshammari
747763c4be
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
5 years ago
Sultan Khan
1a35fe37b6
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Fatimah Alshammari
42bf76f712
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/core/service/parmacyModule/parmacy_module_service.dart
# lib/pages/pharmacies/product_detail.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
5 years ago
Zohaib Iqbal Kambrani
15ec3ec9b9
Translation Track Driver, enhancement, initial camera
5 years ago
Zohaib Iqbal Kambrani
63663f1b24
Track Delivery Driver Completed
5 years ago
Fatimah Alshammari
ac32ba998c
fixed order isuee
5 years ago
Mohammad Aljammal
e6da54c201
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
20ad10b9dc
Merge branches 'development' and 'fix-pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-pharmacy
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
8899bdf460
Done Prescription Delivery Address
5 years ago
mosazaid
1a45f99606
some fixes on pharmacy
5 years ago
haroon amjad
5e8e3806d6
Covid Drive-Thru implemented
5 years ago
Sultan Khan
144ef52c70
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
b3e6c4efda
voice command changes
5 years ago
mosazaid
b70c7d7d05
fix pharmacy auth
5 years ago
Mohammad Aljammal
87ad027d33
Merge branch 'improve_hhc' into 'development'
...
Improve hhc
See merge request Cloud_Solution/diplomatic-quarter!264
5 years ago
Mohammad Aljammal
29f4e6acb6
Merge branch 'hmg-services-fixing' into 'development'
...
Hmg services fixing
See merge request Cloud_Solution/diplomatic-quarter!262
5 years ago
haroon amjad
b6c617888b
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
5 years ago
mosazaid
cbe422cbc6
Merge branch 'hmg-services-fixing' into development
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
0444b21101
Merge branch 'development' into hmg-services-fixing
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah
94ee969406
hhc msg translation
5 years ago
Sultan Khan
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sikander Saleem
aef4c7bfac
H2O feature improvement
5 years ago
haroon amjad
3832cee1ad
Translation fixes
5 years ago
Sikander Saleem
3b4e791017
H2O feature improvement
5 years ago
mosazaid
822defbd04
working on bmi calculator design and functionality
5 years ago
Sultan Khan
3ac69692be
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Mohammad Aljammal
3e441c55b2
fix bottom nav bar
5 years ago
Mohammad Aljammal
9d8c1ddf63
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
484cca086e
fix my my Trackers
5 years ago
haroon amjad
ab158e14e9
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
7c538b350f
LiveCare Scheduling finalized, Appointments in ToDo list categorized
5 years ago
hussam al-habibeh
b767748315
health-converter fix
5 years ago
hussam al-habibeh
97919c217f
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh
1ce0ef7b6c
health-converter fix
5 years ago
Mohammad Aljammal
db2376f50c
fix blood and weight on my trackers
5 years ago
Sultan Khan
ccd2fc5068
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
mosazaid
38d52b52c8
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
5 years ago
mosazaid
174534d8a5
fix Blood donation functionality and design
5 years ago
Mohammad Aljammal
405f67be1e
Merge branch 'pharmacy-Fatima' into 'development'
...
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!249
5 years ago
Fatimah Alshammari
7a516cae51
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
5 years ago
Mohammad Aljammal
f883e1bd78
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljammal
0b1014a91c
fix blood sugar service on my tracker
5 years ago
Fatimah Alshammari
0f22a50a5d
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/pages/pharmacy/profile/profile.dart
5 years ago
Zohaib Iqbal Kambrani
9a5daed5c3
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
re-design child vaccine and fix some funcrionalities
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
# Conflicts:
# lib/config/localized_values.dart
5 years ago
Sultan Khan
c65983bfdb
code merged
5 years ago
Zohaib Iqbal Kambrani
bbd953ae43
Order Delivery Driver tracking [inprogress]
5 years ago
mosazaid
3a45239059
Merge branch 'development' into fix_design
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
mosazaid
f5d478fd27
re-design child vaccine and fix some funcrionalities
5 years ago
Mohammad Aljammal
4457b5f109
add translation to ER service
5 years ago
Mohammad Aljammal
200334d8f8
Fix ER service
5 years ago
Elham Rababah
c9edb37a3c
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/pages/AlHabibMedicalService/ComprehensiveMedicalCheckup/cmc_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah
d7a046f9ca
fix issue on cmc
5 years ago
mosazaid
5bcc67b77d
Nearest Er fix design
5 years ago
Mohammad Aljammal
634c874eee
fix design issues
5 years ago
Fatimah Alshammari
ba4003cb56
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/locator.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/profile/profile.dart
5 years ago
Fatimah Alshammari
52fa0f6f89
fixed orders
5 years ago
Mohammad Aljammal
de1b7cc1d0
fix merge issues
5 years ago
Mohammad Aljammal
3fb522e15f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_merge
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/model/pharmacies/LakumInquiryInformationObjVersion.dart
lib/core/model/pharmacies/order_model.dart
lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
lib/core/viewModels/pharmacyModule/order_model_view_model.dart
lib/locator.dart
lib/main.dart
lib/pages/landing/landing_page_pharmcy.dart
lib/pages/parent_categorise_page.dart
lib/pages/pharmacies/screens/cart-order-page.dart
lib/pages/pharmacies/screens/cart-order-preview.dart
lib/pages/pharmacies/screens/pharmacy_module_page.dart
lib/pages/pharmacies/wishlist.dart
lib/pages/pharmacy/order/Order.dart
lib/pages/pharmacy/order/OrderDetails.dart
lib/pages/pharmacy/order/ProductReview.dart
lib/pages/pharmacy/pharmacyAddresses/AddAddress.dart
lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
lib/pages/pharmacy/profile/profile.dart
lib/services/pharmacy_services/orderDetails_service.dart
lib/services/pharmacy_services/order_service.dart
lib/services/pharmacy_services/pharmacyAddress_service.dart
lib/services/pharmacy_services/wishList_service.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/borderedButton.dart
lib/widgets/others/app_scaffold_widget.dart
lib/widgets/pharmacy/product_tile.dart
5 years ago
Mohammad Aljammal
c82f01cd1a
fix merge issues
5 years ago
Mohammad Aljammal
16d1f667d4
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima_merge
...
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/pages/pharmacy/profile/profile.dart
lib/widgets/pharmacy/product_tile.dart
5 years ago
mosazaid
38d58ebaaf
Merge branch 'pharmacy' into pharmacy_mosa_branch
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/viewModels/pharmacyModule/PharmacyAddressesViewModel.dart
# lib/pages/pharmacy/pharmacyAddresses/PharmacyAddresses.dart
# lib/services/pharmacy_services/pharmacyAddress_service.dart
# lib/uitl/translations_delegate_base.dart
5 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
5 years ago
enadhilal
10734d5994
connecting pages.
...
trnaslate.
calling API.
review page.
product details page.
Wishlist page.
Brands page.
5 years ago
Mohammad Aljammal
519a474d41
fix live care label and vital sign data
5 years ago
Mohammad Aljammal
2059b76fc1
fix Medical profile
5 years ago
Mohammad Aljammal
4d8f42b517
fix issues vital sign issue
5 years ago
Mohammad Aljammal
f6983c138a
fix issues
5 years ago
Mohammad Aljammal
9c12e949e8
hot fixes
5 years ago
Fatimah Alshammari
fda101840a
fixed order isuues
5 years ago
Mohammad Aljammal
9c18c69d90
hot fixes
5 years ago
Mohammad Aljammal
7167d58ce2
fix merge issues
5 years ago
Mohammad Aljammal
aa89a05f1d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
...
Conflicts:
ios/Flutter/.last_build_id
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/core/service/medical/prescriptions_service.dart
lib/core/viewModels/project_view_model.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/BookAppointment/BookConfirm.dart
lib/pages/BookAppointment/DoctorProfile.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/MyAppointments/models/ArrivedButtons.dart
lib/pages/MyAppointments/widgets/AppointmentActions.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/feedback/send_feedback_page.dart
lib/pages/insurance/insurance_approval_screen.dart
lib/pages/insurance/insurance_card_screen.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/pages/medical/balance/my_balance_page.dart
lib/pages/medical/labs/laboratory_result_page.dart
lib/pages/medical/labs/labs_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/patient_sick_leave_page.dart
lib/pages/medical/prescriptions/prescription_details_page.dart
lib/pages/medical/prescriptions/prescription_items_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/pages/medical/radiology/radiology_home_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/pages/medical/reports/reports_page.dart
lib/pages/pharmacies/pharmacies_list_screen.dart
lib/pages/settings/profile_setting.dart
lib/services/authentication/auth_provider.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/floatingActionButton.dart
lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
lib/widgets/data_display/medical/doctor_card.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal
b29fdbb7d0
fix home issues
5 years ago
Mohammad Aljammal
d9759560c3
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
...
Conflicts:
lib/config/localized_values.dart
lib/pages/login/login.dart
5 years ago
Mohammad Aljammal
02d72fa27c
fix issues
5 years ago
Fatimah Alshammari
4a84483698
fixed order details
5 years ago
Sultan Khan
0f594059b5
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
haroon amjad
a7dc2fdfd1
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
5 years ago
haroon amjad
781fd1c287
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
3aa592e2b0
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
b759758a68
bug fixes
5 years ago
Mohammad Aljammal
f38f53587b
fix issues
5 years ago
Haroon Amjad
3308aa47e1
fixes
5 years ago
Mohammad Aljammal
19f12116c4
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
5 years ago
Mohammad Aljammal
de1e352e98
fix charts and vital sign
5 years ago
Haroon Amjad
c67d41701d
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Haroon Amjad
5606c88715
hot fixes
5 years ago
Mohammad Aljammal
92e6275162
Add Confirm send email dialog
5 years ago
haroon amjad
051bd1e23f
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Mohammad Aljammal
97776ce99b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
5 years ago
Mohammad Aljammal
b25bdbb6fa
fix LiveChatPage Service LabOrderResult MedicineSearch issues
5 years ago
haroon amjad
75de755ccd
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
a2ec01be5d
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
...
Conflicts:
lib/config/localized_values.dart
lib/pages/landing/home_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
2f77592bac
fix Prescriptions Service and design issues
5 years ago
haroon amjad
740a294867
Translation & bug fixes
5 years ago
Sultan Khan
c813deea29
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
haroon amjad
d14e7e5223
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/radiology/radiology_details_page.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
e28209d4e8
bug fixes
5 years ago
Haroon Amjad
9d3c64200e
fixes
5 years ago
Mohammad Aljammal
eca2266f7b
hot fixing
5 years ago
Mohammad Aljammal
4d203c8a5b
fix LabResult
5 years ago
Mohammad Aljammal
554ed1b50a
fix insurance update
5 years ago
Sultan Khan
542335364e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
c050c3f189
voice command updated
5 years ago
mosazaid
378562b781
adding some changes in order pages like translate texts
5 years ago
Mohammad Aljammal
2e2a29145c
fix merge issues
5 years ago
Mohammad Aljammal
459ba828d9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
...
Conflicts:
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/home_page.dart
lib/pages/medical/vital_sign/vital_sign_item.dart
lib/routes.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
5 years ago
Fatimah Alshammari
706980248a
Merge branch 'pharmacy' into pharmacy-Fatima
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
5 years ago
Mohammad Aljammal
77dcb918c3
Revert "Merge branch 'pharmacy-hussam' into 'master'"
...
This reverts merge request !149
5 years ago
Fatimah Alshammari
9b8103bfd6
fixe order and order details
5 years ago
Sultan Khan
af1c59394c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
496163a61a
voice command updated
5 years ago
Mohammad Aljammal
47e4b99f11
fix issues
5 years ago
Mohammad Aljammal
9e8def6584
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_issues
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljammal
4e2c955b09
add missing translation
5 years ago
haroon amjad
dfa1952f4d
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
5 years ago
hussam al-habibeh
a1906a4072
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
5 years ago
haroon amjad
257dc3d76d
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
...
create terms-condition in pharmacy order page
See merge request Cloud_Solution/diplomatic-quarter!154
5 years ago
mosazaid
7ee7ef58c4
working on dynamic title on pharmacy
5 years ago
umasoodch
b5413d1749
Merge branch 'master' into pharmacy
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Sultan Khan
f5b7d35f23
bug fixes
5 years ago
Sultan Khan
8c5746f7b1
bug fixes
5 years ago
Sultan Khan
8d7cc20b70
localized value updated
5 years ago
Sultan Khan
321d31b3bd
voice search page updated
5 years ago
hussam al-habibeh
64cbae3602
Search
5 years ago
Sultan Khan
81c8239412
bug fixes
5 years ago
Mohammad Aljammal
1c23e28081
fix merge issues
5 years ago
Mohammad Aljammal
ced86de9fe
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info
...
Conflicts:
lib/config/localized_values.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/balance/my_balance_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
269f682bd5
Added info images description
5 years ago
mosazaid
35d0d3e441
finsi lakum points task
5 years ago
haroon amjad
f1a8e09a59
Added info images description
5 years ago
haroon amjad
47b030eb82
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# ios/Flutter/.last_build_id
# lib/config/config.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
7edb0c8009
Doctor rating dialog revamped
5 years ago
Mohammad Aljammal
3daef6e53f
add images info
5 years ago
Sultan Khan
3ab513d9d0
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Elham Rababah
713e44cf8b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Elham Rababah
ea195ea9bf
Finish translate CMC HHC
5 years ago
haroon amjad
65fbd7af8e
referral finalised
5 years ago
Zohaib Kambrani
1155466d19
Packages and Offer Slider at home
5 years ago
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
5 years ago
mosazaid
4e5d6a9a00
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
5 years ago
Elham Rababah
5bf63174c9
First step from translations
5 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
5 years ago
Sultan Khan
8de838a6dc
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
Sultan Khan
2fb0ccfdbd
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
haroon amjad
6846a8501a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
0181043da8
Ereferral fixes, smartwatch health data integration
5 years ago
Mohammad Aljammal
2185f5ce11
Merge branch 'hhc_cmc' into 'master'
...
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!138
5 years ago
Zohaib Kambrani
27182ee8db
no message
5 years ago
Mohammad Aljammal
54d8965773
done child Vaccination
5 years ago
haroon amjad
97b8aeeff5
Version Control finished
5 years ago
Sultan Khan
909401cc7e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
5 years ago
haroon amjad
92db2b2be9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
5 years ago
Elham Rababah
3ef22be7da
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
...
Conflicts:
lib/config/config.dart
5 years ago
Elham Rababah
a87855f445
Fix issues on hhc module
5 years ago
Mohammad Aljammal
49974f81db
add translations to child Vaccination
5 years ago
haroon amjad
e5feef8a9d
Updates & UI Fixes
5 years ago
Sultan Khan
0f80224016
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
a556e8c1f8
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
...
Conflicts:
lib/config/config.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
5 years ago
Mohammad Aljammal
b6d2878cf1
add Radiology translations and colors
5 years ago
Fatimah Alshammari
d328c74fc4
fix order and orderdetails
5 years ago
Mohammad Aljammal
b504f379de
fix lab result translations and colors
5 years ago
Sultan Khan
24b7bca471
no message
5 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
5 years ago
Mohammad Aljammal
0966269537
Merge branch 'sultan' into 'diplomatic-quarter-live'
...
Sultan
See merge request Cloud_Solution/diplomatic-quarter!116
5 years ago
Mohammad Aljammal
3c1257b379
fix Medicine Search
5 years ago
Sultan Khan
30a8e24521
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
91be66ecdd
family file changes
5 years ago
Mohammad Aljmma
6523a1dea9
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Sultan Khan
3589b21590
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljmma
770d28033d
fix issues#26 & 27 & 28
5 years ago
haroon amjad
b81af62551
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
5 years ago
haroon amjad
b89c1f03b3
language translation fixes
5 years ago
Mohammad Aljmma
8f38dc6077
fix issue #24
5 years ago
Sultan Khan
1eb6516ea6
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
3fef1b9d52
theme and login issues fixed
5 years ago
Mohammad Aljmma
59defa4532
fix issue #15
5 years ago
Mohammad Aljmma
5e8b61bf2d
fix issue #13
5 years ago
Mohammad Aljmma
a742f896be
fix issue#4
5 years ago
Mohammad Aljmma
e1f6ef5e5b
fix Prescriptions history
5 years ago
Sultan Khan
283473a06a
theme changes
5 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
5 years ago
Fatimah Alshammari
f137bd44c0
created order and order details UI pages
5 years ago
Sultan Khan
4976870d2e
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
875bf10c73
settings page added
5 years ago
Mohammad Aljmma
6a83538544
add info for Medical
5 years ago
Elham Rababah
64f970c40c
Fix issues after the merge
5 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
5 years ago
Sultan Khan
0443a37886
register page updated
5 years ago
Elham Rababah
5bd3c7d9ce
finish step from notifications_page and create notification_details_page
5 years ago
Sultan Khan
d939b2ec9b
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
f8e05fc447
regiter 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
Elham Rababah
9f2beceb22
First step from notifications_page
5 years ago
Mohammad Aljmma
e42f953bd1
fix prescription report issues
5 years ago
mosazaid
d1ac4080ca
working on pharmacy home page
5 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
5 years ago
Mohammad Aljmma
d4be20b07b
add icons
5 years ago
Mohammad Aljmma
e10a0a4d54
add splash page fix language issues
5 years ago
haroon amjad
1553e71e7d
New loading dialog added into appointment flow
5 years ago
Mohammad Aljmma
856ab52439
fix ui issues
5 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
5 years ago
Mohammad Aljmma
874de15040
change the home page design
5 years ago
haroon amjad
d5118bda11
Login / Register UI fixes
5 years ago
Sultan Khan
deb828b4dd
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
jammal
9328f942ba
done ER service
5 years ago
Fatimah Alshammari
1e00b9a4d8
added my-profile
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
Sultan Khan
f03a711dff
symptom checker gender page updated
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
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
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
5 years ago
Mohammad Aljammal
06416b4934
add Not authenticated Page
5 years ago
Elham Rababah
83ab1b4d61
fix issues in the services logic and add some translation
5 years ago
Sultan Khan
ea86e88e2e
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
haroon amjad
7fdc0da9dc
livecare scheduling implemented
5 years ago
Mohammad Aljammal
bae6fe4ad6
fix marge issues
5 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
5 years ago
haroon amjad
c9256a654a
LiveCare Scheduling updates
5 years ago
Mohammad Aljammal
3ffff9686d
Done allergies service
5 years ago
Sultan Khan
03ff56f2de
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
hussam al-habibeh
3c5adc0a1d
HMG Service layout
5 years ago
Mohammad Aljammal
9f06ce7d1d
done EyeMeasurements service
5 years ago
Mohammad Aljammal
4ac77593ad
add payment service page and translations
5 years ago
Sultan Khan
da7fa1038a
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
57ed83a139
Merge branch 'vaccine' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into patient_sick_leave
...
Conflicts:
lib/config/config.dart
5 years ago
Sultan Khan
63e6d06e74
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
ea02622977
fix merge issues
5 years ago
Mohammad Aljammal
8e96c79d05
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
...
Conflicts:
lib/config/localized_values.dart
5 years ago
Mohammad Aljammal
33bd972984
add my vaccines item screen
5 years ago
Sultan Khan
3dc54230be
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
9159928e27
edit on vaccine service
5 years ago
Sultan Khan
7908506d5f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
153335538a
done monthly reports
5 years ago
Sultan Khan
a98bc226e6
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
b0f0b87345
fix merge issues
5 years ago
Mohammad Aljammal
68466c8d03
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/models/Appointments/DoctorListResponse.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
5 years ago
Mohammad Aljammal
fe66ee5993
fix lab result issues
5 years ago
Sultan Khan
f6a3f0e615
family file
5 years ago
haroon amjad
51078227ab
Dental appointment flow implemented
5 years ago
Mohammad Aljammal
1b3a780a29
add ar lan for medical profile
5 years ago
Sultan Khan
826c50ebf1
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Sultan Khan
4a75215a19
search
5 years ago
Mohammad Aljammal
5ec3935c68
ER
5 years ago
Mohammad Aljammal
ef4a57223c
fix DoctorView.dart UI issues
5 years ago
haroon amjad
35cd02494c
implemented search by doctor list
5 years ago
haroon amjad
13adb46319
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/localized_values.dart
# lib/config/shared_pref_kay.dart
5 years ago
haroon amjad
f669adcb9d
Location service implemented
5 years ago
Mohammad Aljammal
91e5a20fd0
fix merge issues
5 years ago
Mohammad Aljammal
54b766de81
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal
01a011a03d
done dashboard page
5 years ago
Sultan Khan
3247378c02
search
5 years ago
Mohammad Aljammal
895c09efa4
parking service
5 years ago
Sultan Khan
8516f7de1b
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
5 years ago
Mohammad Aljammal
4adc2916b4
fix merge issues
5 years ago
Mohammad Aljammal
30c0963063
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
...
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal
8989fbc9b7
done design dashboard
5 years ago
Sultan Khan
327c4585a6
family file change
5 years ago
haroon amjad
db30fbdfd2
implementing livecare
6 years ago
haroon amjad
73cf37a3a5
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/core/service/client/base_app_client.dart
6 years ago
Mohammad Aljammal
a5e63817f2
done vital sign
6 years ago
haroon amjad
fde47a5c2c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/core/service/client/base_app_client.dart
6 years ago
haroon amjad
750746aabe
updates & fixes
6 years ago
Mohammad Aljammal
d093ecd5e6
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
...
Conflicts:
ios/Podfile
ios/Runner.xcodeproj/project.pbxproj
lib/config/config.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal
b4b33be3e9
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
Conflicts:
lib/core/service/client/base_app_client.dart
6 years ago
Mohammad Aljammal
37b874fe3f
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
...
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal
a1fa2c0727
done vital sign
6 years ago
Sultan Khan
adbdd2dd0d
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
621870eca1
family file changes
6 years ago
haroon amjad
7d0efda1c4
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/medical_profile_page.dart
# lib/services/authentication/auth_provider.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
6 years ago
hussam al-habibeh
f77d4fac66
insurance translation
6 years ago
Haroon Amjad
8ad2941836
Appointment payment finalised, Ask Doc implemeted & other updates
6 years ago
Sultan Khan
8ee3b3b557
family files.
6 years ago
Sultan Khan
8e3fb6831d
registration changes
6 years ago
haroon amjad
28fde5c500
My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates
6 years ago
Sultan Khan
ecfa1756d3
login changes
6 years ago
Sultan Khan
0bc529f420
login changes
6 years ago
Sultan Khan
9d0a2e1e43
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
8d0834ff3e
login inprogress
6 years ago
haroon amjad
b3e5047820
Payment method selection page created, Appointment details functions implemented
6 years ago
haroon amjad
0171664779
Master Merged in to local
6 years ago
haroon amjad
049d455e3c
Implementing appointment details functions
6 years ago
Mohammad Aljammal
1ac420ef7c
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
6 years ago
Sultan Khan
3a15c16883
login changes
6 years ago
haroon amjad
f5ddfabf50
Todo list implemented, Appointment details implemented, Appointment Reschedule implemented, Appointment Confirmed implemented
6 years ago
hussam al-habibeh
e92cb2e1ac
Design and return Pharmacy List
6 years ago
haroon amjad
7f4fbadfab
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
6 years ago
haroon amjad
d8fe501341
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/pages/BookAppointment/BookingOptions.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
6 years ago
Sultan Khan
31fe444150
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
b0989d6ca0
login pages changes
6 years ago
Sultan Khan
76aeeffad7
login page changes
6 years ago
Mohammad Aljammal
01b230accf
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into SearchMedicineAndReturnMedicineList
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/main.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
6 years ago
Sultan Khan
5b411c3120
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
6 years ago
Sultan Khan
c018597d90
confrim login page added
6 years ago
haroon amjad
e34da6485b
Doctor Free Slots implemented
6 years ago
Mohammad Aljammal
2d5b725818
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_merge
...
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
6 years ago
hussam al-habibeh
31d2816e64
design for search medicine and return medicine list
6 years ago
Sultan Khan
f8d8e1c685
new pages added
6 years ago
Sultan Khan
192b21a7e7
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
...
# Conflicts:
# lib/main.dart
# lib/widgets/input/date_picker/button_actions.dart
# lib/widgets/input/text_field.dart
# lib/widgets/others/app_scaffold_widget.dart
6 years ago
Sultan Khan
8dd38a8b3c
no message
6 years ago
haroon amjad
a0173c5b4d
Appointment Details page, ToDo List Page implemented
6 years ago
haroon amjad
9842c3a0b1
Translation updates
6 years ago
haroon amjad
1554a6bdf5
Book Appointment Flow added
6 years ago
Sultan Khan
4a0cc17069
login module started
6 years ago
Mohammad Aljammal
19676549e1
add base client, landing page, bottom_nav_bar , List Container, List Item, drawer progress indicator and asset file
6 years ago
Mohammad Aljammal
3ed5c3878f
init project structure By Mohammad and Elham
6 years ago