mosazaid
|
6ac8d67b83
|
finish address add/edit/delete/select
|
5 years ago |
Zohaib Kambrani
|
8d5d55a150
|
Geofencing in progress
|
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 |
mosazaid
|
378562b781
|
adding some changes in order pages like translate texts
|
5 years ago |
enadhilal
|
9c55571072
|
Merge branch 'pharmacy' into enad_pharmacy2
|
5 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
|
5 years ago |
enadhilal
|
888a74fb9b
|
add these pages
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
|
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 |
Fatimah Alshammari
|
9b8103bfd6
|
fixe order and order details
|
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
|
5dc3c53550
|
mousa and hussam branch
|
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 |
hussam al-habibeh
|
800565407d
|
12/6
|
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 |
hussam al-habibeh
|
8b8207cb0d
|
search
|
5 years ago |
Sultan Khan
|
f5b7d35f23
|
bug fixes
|
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 |
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 |
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 |
Elham Rababah
|
05deaa6322
|
Address Added Successfully
|
5 years ago |
Sultan Khan
|
de2a5e55eb
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
7d3c1ac852
|
weather indicator updated
|
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 |
haroon amjad
|
a03d5c6d57
|
App initial release to stores
|
5 years ago |
Elham Rababah
|
7aa7af6de7
|
finish CMC module
|
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 |
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
|
482ec536de
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing
Conflicts:
lib/config/config.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
|
d0891ba16b
|
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix lab result translations and colors
See merge request Cloud_Solution/diplomatic-quarter!128
|
5 years ago |
Mohammad Aljammal
|
b504f379de
|
fix lab result translations and colors
|
5 years ago |
Sultan Khan
|
1b678e0aca
|
fingerprint
|
5 years ago |
Sultan Khan
|
8429f83d7c
|
registration done
|
5 years ago |
Mohammad Aljammal
|
f70ca95a38
|
fix merge issues
|
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
|
67cc5e2033
|
fix Prescriptions
|
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 |
Mohammad Aljmma
|
501692587f
|
change the base Url
|
5 years ago |
Mohammad Aljmma
|
a9b11a6b03
|
fix lab result
|
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 |
Mohammad Aljmma
|
ed7b9d609f
|
fix lab result
|
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 |
Sultan Khan
|
bedafa24cd
|
insurance details
|
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 |
hussam al-habibeh
|
69ea8b7bd7
|
daynmic products listing
|
5 years ago |
Sultan Khan
|
283473a06a
|
theme changes
|
5 years ago |
Sultan Khan
|
d1336eec8b
|
login type
|
5 years ago |
Sultan Khan
|
f05b235cd0
|
login issue
|
5 years ago |
Sultan Khan
|
cced69502a
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |