089ad0d321
Booking appointment 1.3
3 years ago
Sikander Saleem
ca363adee2
merge & improvements
3 years ago
8b3a0b3ada
Revert "Merge branch 'foote_in_all_pages' into 'development'"
...
This reverts merge request !369
3 years ago
ba0c0beef6
Merge branch 'development_new_design_2.0' into mirza_home_page
3 years ago
d83a611d95
FCM Permission fix
3 years ago
bd1cf9bcc7
Merge branch 'development_new_design_2.0' into mirza_home_page
...
# Conflicts:
# lib/pages/BookAppointment/components/SearchByClinic.dart
# lib/widgets/drawer/app_drawer_widget.dart
3 years ago
62631677ad
Booking appointment 1.0
3 years ago
ceeda154d5
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
...
Conflicts:
lib/pages/landing/landing_page.dart
3 years ago
Sikander Saleem
71f888ea9b
improvements
3 years ago
Sikander Saleem
bb18645d85
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/AlHabibMedicalService/ancillary-orders/ancillaryOrdersDetails.dart
# lib/pages/MyAppointments/AppointmentDetails.dart
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/uitl/translations_delegate_base.dart
3 years ago
301728ed3d
family file fix
3 years ago
0a83cf8241
Bug Fixis
3 years ago
9e31a3c560
bug fixes
3 years ago
3f29bbd6b3
Updates & fixes
3 years ago
11ffed2ae3
bug fixes
3 years ago
Sikander Saleem
5647ab75e5
improvements.
3 years ago
Sikander Saleem
197e7d5742
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/medical/patient_sick_leave_page.dart
# lib/uitl/translations_delegate_base.dart
# lib/uitl/utils.dart
3 years ago
f85c359cf4
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into foote_in_all_pages
...
Conflicts:
lib/pages/landing/landing_page.dart
3 years ago
69df61afb1
remove footer from pharmacy pages
3 years ago
d865e97ce1
Vital Sings Home Page
3 years ago
cd56881d7a
Merge branch 'pharmacy-bugs' into 'development'
...
hide Covid19-driveThrow for patient out of KSA
See merge request Cloud_Solution/diplomatic-quarter!353
3 years ago
66efbc1bac
Radiology Implementation
3 years ago
29fd552874
Weight, height and blood pressure on Home Page
3 years ago
352cda4c70
hide Covid19-driveThrow for patient out of KSA
3 years ago
8626b4f269
first step from add footer for all pages
3 years ago
876463c945
Home Page Font weight
3 years ago
85c759a4a5
Merge branch 'mirza_home_page' into development_new_design_2.0
3 years ago
6b7eaaafb9
fixes
3 years ago
5f44dece71
Ganaric Font and font implementaion
3 years ago
Sikander Saleem
56c0adaada
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
3 years ago
38465eaafb
Home page icons and drawer
3 years ago
06f877b8d4
Home page new design & drawer
3 years ago
709877b5f1
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/pages/login/forgot-password.dart
# lib/pages/medical/radiology/radiology_details_page.dart
3 years ago
90db04cee1
Jira Fixes
3 years ago
Sikander Saleem
083d696c62
Merge branch 'development' into development_new_design_2.0
...
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/login.dart
# lib/uitl/translations_delegate_base.dart
3 years ago
32e867421f
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/date_uitl.dart
# lib/uitl/translations_delegate_base.dart
3 years ago
e9e3b079b3
Medical Profile Complete 1.1
3 years ago
bbaeec5b85
Medical Profile Complete
3 years ago
Sikander Saleem
f6ae7ed770
merge changes-4
3 years ago
7c398ba40d
bug fix
3 years ago
2665e4cd0c
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
3 years ago
a20185b2b9
Home page 1.4 (Homepage changes)
3 years ago
Sikander Saleem
2cb59a286f
Merge branch 'login_design_sikander' into development_new_design_2.0
3 years ago
Sikander Saleem
473315f8a1
improvements
3 years ago
3c438406b5
Merge branch 'mirza_home_page' into development_new_design_2.0
...
# Conflicts:
# lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem
53e4815866
no auth ui modifications
3 years ago
49bfa2e9a7
Home page 1.3
3 years ago
ed20ba65b3
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
3 years ago
23ca95b9b6
bug fixes
3 years ago
ed5079e3a0
Merge branch 'pharmacy-bugs' into 'development'
...
Pharmacy bugs
See merge request Cloud_Solution/diplomatic-quarter!334
3 years ago
50d3a42743
fixing dashboard issue
3 years ago
1ed76e91aa
fixing dashboard issue
3 years ago
a67e320a8e
Merge branch 'ZohaibIqbalKambrani' into 'development'
...
Zohaib iqbal kambrani
See merge request Cloud_Solution/diplomatic-quarter!333
3 years ago
6dc0d89f61
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
...
Conflicts:
lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
lib/uitl/utils.dart
3 years ago
981e78936e
jira bugs
3 years ago
08e0ce52c8
Merge branch 'development' into ZohaibIqbalKambrani
...
* development:
fix bugs
3 years ago
4abdd9bde7
no message
3 years ago
882d5f090a
Merge branch 'zik-analytics' into ZohaibIqbalKambrani
...
* zik-analytics:
no message
3 years ago
2e33c2b240
fix bugs
3 years ago
d37f225c1b
Home page 1.2
3 years ago
5dc88f51c3
Home Page 1.0
3 years ago
dbf525c484
no message
3 years ago
14ef096c32
changes and fixes
3 years ago
15f620d720
Merge branch 'Jul_fixes' into 'development'
...
Jul fixes
See merge request Cloud_Solution/diplomatic-quarter!322
3 years ago
58d5734f1a
Bug Fix: 873, 878 to 881
3 years ago
c6a68083a4
PAP-667: fix blood type
3 years ago
c14adccb49
PAP-667: add unit to home page
3 years ago
cd7845b1a4
bug fix
4 years ago
3d6858d0ec
bug fixes
4 years ago
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
4 years ago
6f2c947687
Packages And offers..
4 years ago
e0ebb922ed
pharmacy fixes
4 years ago
b9a12341d5
updates & fixes
4 years ago
747763c4be
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/config/localized_values.dart
# lib/locator.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
4 years ago
a46dddea9a
Merge branch 'development' into pharmacy-Fatima
...
# Conflicts:
# lib/core/model/pharmacies/order_model.dart
# lib/pages/pharmacies/product-brands.dart
# lib/pages/pharmacies/screens/pharmacy_module_page.dart
# lib/pages/pharmacy/order/Order.dart
# lib/pages/pharmacy/order/OrderDetails.dart
# lib/pages/pharmacy/profile/profile.dart
4 years ago
1a35fe37b6
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
e61c26b853
Auto SMS, Themes, Voice Command
4 years ago
da3ad90ddd
added app-wide route transition animation
4 years ago
d8e11f7187
Merge branch 'development' into Haroon
4 years ago
deb0b40cfe
fixes
4 years ago
0cb493d56c
Merge branch 'development' into enad_pharmacy2
...
# Conflicts:
# lib/pages/pharmacies/product_detail.dart
4 years ago
0c6fb67718
fixed issues
4 years ago
125dd27a00
Merge branch 'development' into fix-pharmacy
4 years ago
5d0a122689
fix bugs
4 years ago
144ef52c70
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
b3e6c4efda
voice command changes
4 years ago
f72c860516
Merge branch 'development' into Haroon
4 years ago
69649ff7f8
added verified icon in homepage when patient is logged in
4 years ago
8a1924cca2
fix images in hhc
4 years ago
d33918c932
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
9fca52efca
voice command
4 years ago
d477481856
fix security issues in pharmacy
4 years ago
Sikander Saleem
8f37fbf260
Qr icon added, notify me api added & improvements
4 years ago
3ac69692be
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
0213264b7f
bug fixes
4 years ago
3e441c55b2
fix bottom nav bar
4 years ago
ccd2fc5068
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
4 years ago
6945230965
Merge branch 'development' into Haroon
...
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/pages/landing/home_page.dart
# lib/pages/medical/smart_watch_health_data/health_data_list.dart
# lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
4 years ago
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
4 years ago
c65983bfdb
code merged
4 years ago
Mirza.Shafique
Sikander Saleem
Mohammad Aljammal
haroon amjad
Elham Rababh
Sultan Khan
Sultan khan
hussam al-habibeh
Zohaib Iqbal Kambrani
mosazaid
Fatimah Alshammari
enadhilal
Mohammad Aljammal