Mohammad Aljammal
|
02d72fa27c
|
fix issues
|
4 years ago |
Zohaib Kambrani
|
78928335ef
|
Geofences Login check (unregister/register geozones on logout/logout)
|
4 years ago |
|
Zohaib Kambrani
|
6f6ab8d987
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
19f12116c4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
|
4 years ago |
Mohammad Aljammal
|
de1e352e98
|
fix charts and vital sign
|
4 years ago |
|
Zohaib Kambrani
|
b7088f70cd
|
Merge master in to my branch with Geofence iOS
|
4 years ago |
Haroon Amjad
|
5606c88715
|
hot fixes
|
4 years ago |
haroon amjad
|
051bd1e23f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
Zohaib Kambrani
|
67f4b4e167
|
iOS Geofence in progress
|
4 years ago |
|
Zohaib Kambrani
|
8457972fda
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
b25bdbb6fa
|
fix LiveChatPage Service LabOrderResult MedicineSearch issues
|
4 years ago |
Zohaib Kambrani
|
92ba977fca
|
no message
|
4 years ago |
|
Zohaib Kambrani
|
8d5d55a150
|
Geofencing in progress
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
2f77592bac
|
fix Prescriptions Service and design issues
|
4 years ago |
|
Mohammad Aljammal
|
62b923b25e
|
fix send rad report email
|
4 years ago |
|
Mohammad Aljammal
|
9cec304712
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!168
|
4 years ago |
Sultan Khan
|
21ccf1ef86
|
bug fixes
|
4 years ago |
|
Mohammad Aljammal
|
4d203c8a5b
|
fix LabResult
|
4 years ago |
enadhilal
|
c22ca4e29e
|
Merge branch 'pharmacy' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# lib/widgets/pharmacy/product_tile.dart
|
4 years ago |
|
enadhilal
|
888a74fb9b
|
add these pages
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
|
4 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
|
4 years ago |
|
hussam al-habibeh
|
800565407d
|
12/6
|
4 years ago |
mosazaid
|
4c9a1862d2
|
make pharmacy home page load data even without login, and some mini changes
|
4 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
|
4 years ago |
 umasoodch
|
b5413d1749
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
709ba2ce97
|
create terms-condition in pharmacy order page
|
4 years ago |
|
Sultan Khan
|
f5b7d35f23
|
bug fixes
|
4 years ago |
|
hussam al-habibeh
|
64cbae3602
|
Search
|
4 years ago |
|
mosazaid
|
35d0d3e441
|
finsi lakum points task
|
4 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
|
4 years ago |
|
haroon amjad
|
7edb0c8009
|
Doctor rating dialog revamped
|
4 years ago |
|
haroon amjad
|
65fbd7af8e
|
referral finalised
|
4 years ago |
|
Zohaib Kambrani
|
1155466d19
|
Packages and Offer Slider at home
|
4 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
|
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 |
|
haroon amjad
|
82e23efd32
|
working on ereferral
|
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 |
|
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
|
4 years ago |
|
haroon amjad
|
0181043da8
|
Ereferral fixes, smartwatch health data integration
|
4 years ago |
|
Mohammad Aljammal
|
2185f5ce11
|
Merge branch 'hhc_cmc' into 'master'
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!138
|
4 years ago |
Elham Rababah
|
05deaa6322
|
Address Added Successfully
|
4 years ago |
|
Elham Rababah
|
68e4b92717
|
Address Added Successfully
|
4 years ago |
|
Sultan Khan
|
7d3c1ac852
|
weather indicator updated
|
4 years ago |
|
Sultan Khan
|
648d9d245d
|
health weather indicator
|
4 years ago |
|
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
|
Elham Rababah
|
ed56476d81
|
second step from location fixes
|
4 years ago |
|
Mohammad Aljammal
|
54d8965773
|
done child Vaccination
|
4 years ago |
|
haroon amjad
|
97b8aeeff5
|
Version Control finished
|
4 years ago |
|
Elham Rababah
|
7aa7af6de7
|
finish CMC module
|
4 years ago |
|
Elham Rababah
|
3ef22be7da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
Conflicts:
lib/config/config.dart
|
4 years ago |
|
Elham Rababah
|
a87855f445
|
Fix issues on hhc module
|
4 years ago |
|
Sultan Khan
|
340b9770c8
|
login
|
4 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
|
4 years ago |
Fatimah Alshammari
|
d328c74fc4
|
fix order and orderdetails
|
4 years ago |
|
Mohammad Aljammal
|
0ac599ea1c
|
fix vital Sign
|
4 years ago |
|
haroon amjad
|
d284ceac04
|
advance payment & payment flow issues fixed
|
4 years ago |
|
Sultan Khan
|
391e178484
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
8d499704dc
|
family file changes
|
4 years ago |
|
Mohammad Aljammal
|
dcbc0de69f
|
fix prescription
|
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 Aljammal
|
67cc5e2033
|
fix Prescriptions
|
4 years ago |
|
Mohammad Aljammal
|
0966269537
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!116
|
4 years ago |
|
Sultan Khan
|
30a8e24521
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
b785f87dac
|
fix App drawer after logout
|
4 years ago |
|
Mohammad Aljammal
|
ddc7eca605
|
fix Insurance Cards
|
4 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
|
4 years ago |
|
Mohammad Aljmma
|
a9b11a6b03
|
fix lab result
|
4 years ago |
|
Sultan Khan
|
3589b21590
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljmma
|
ed7b9d609f
|
fix lab result
|
4 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
|
4 years ago |
|
haroon amjad
|
b89c1f03b3
|
language translation fixes
|
4 years ago |
|
Sultan Khan
|
1f4f81b454
|
insurance card details
|
4 years ago |
|
Sultan Khan
|
bedafa24cd
|
insurance details
|
4 years ago |
|
Mohammad Aljmma
|
8f38dc6077
|
fix issue #24
|
4 years ago |
|
Sultan Khan
|
1eb6516ea6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
3fef1b9d52
|
theme and login issues fixed
|
4 years ago |
|
Mohammad Aljmma
|
e1f6ef5e5b
|
fix Prescriptions history
|
4 years ago |
|
hussam al-habibeh
|
69ea8b7bd7
|
daynmic products listing
|
4 years ago |
|
Sultan Khan
|
d1336eec8b
|
login type
|
4 years ago |
|
Sultan Khan
|
f05b235cd0
|
login issue
|
4 years ago |
|
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
4 years ago |
|
haroon amjad
|
ffbc7c4af4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/pages/landing/home_page.dart
|
4 years ago |
|
Mohammad Aljmma
|
7d2f1cf318
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication
|
4 years ago |
|
Mohammad Aljmma
|
570aa514cd
|
fix user authentication data
|
4 years ago |
|
haroon amjad
|
b7b7ead3ba
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
f0897881d1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
Elham Rababah
|
124d388ee1
|
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
Conflicts:
lib/pages/BookAppointment/components/DocAvailableAppointments.dart
lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
|
4 years ago |
|
Mohammad Aljmma
|
4a4d5248a2
|
fix status issue
|
4 years ago |
|
haroon amjad
|
5020c24e8b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/services/authentication/auth_provider.dart
|
4 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
|
4 years ago |
|
haroon amjad
|
15a8e64e7c
|
updates & fixes
|
4 years ago |
|
Elham Rababah
|
41b919183f
|
Fix bug on read notifications_page.dart
|
4 years ago |
|
hussam al-habibeh
|
7815005e21
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
hussam al-habibeh
|
69a6bc2812
|
offers page
|
4 years ago |
|
Elham Rababah
|
5bd3c7d9ce
|
finish step from notifications_page and create notification_details_page
|
4 years ago |
|
Mohammad Aljmma
|
747cffacfc
|
fix lab result
|
4 years ago |
|
mosazaid
|
2095f2c62a
|
fix merge issue
|
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
|
9a169ff77b
|
finish home page and start working on order preview page
|
4 years ago |