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 |
Mohammad Aljammal
|
62b923b25e
|
fix send rad report email
|
5 years ago |
Mohammad Aljammal
|
5083080ba3
|
fix vital sign details
|
5 years ago |
haroon amjad
|
1db5b15dcd
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
5 years ago |
haroon amjad
|
9ecaaa1b12
|
radiology fix in appointment details
|
5 years ago |
Mohammad Aljammal
|
6fd405e9eb
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!173
|
5 years ago |
Sultan Khan
|
e71c28472d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
9d9d77ee3a
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
4705a79245
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!170
|
5 years ago |
Sultan Khan
|
c813deea29
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Mohammad Aljammal
|
be586892d3
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!171
|
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
|
9cec304712
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!168
|
5 years ago |
Mohammad Aljammal
|
f9ac57e5b9
|
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Hot fix
See merge request Cloud_Solution/diplomatic-quarter!169
|
5 years ago |
Mohammad Aljammal
|
eca2266f7b
|
hot fixing
|
5 years ago |
Sultan Khan
|
21ccf1ef86
|
bug fixes
|
5 years ago |
hussam al-habibeh
|
e85b21c08f
|
parent_categorise_page update
|
5 years ago |
haroon amjad
|
c4bb75eab4
|
Doctor rating fixed
|
5 years ago |
haroon amjad
|
8d20762050
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
Mohammad Aljammal
|
f7ee16f115
|
Merge branch 'privileges' into 'master'
Privileges
See merge request Cloud_Solution/diplomatic-quarter!167
|
5 years ago |
Mohammad Aljammal
|
a1e92e1fdd
|
fix merge issue
|
5 years ago |
Mohammad Aljammal
|
9dfd8a71dc
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
Conflicts:
lib/locator.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/login/confirm-login.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/widgets/bottom_navigation/bottom_nav_bar.dart
lib/widgets/drawer/app_drawer_widget.dart
|
5 years ago |
Mohammad Aljammal
|
9b8599a2cf
|
remove load user from SplashScreen
|
5 years ago |
Mohammad Aljammal
|
735ed91f9c
|
Merge branch 'fix_insurance_update' into 'diplomatic-quarter-live'
fix LabResult
See merge request Cloud_Solution/diplomatic-quarter!166
|
5 years ago |
Mohammad Aljammal
|
4d203c8a5b
|
fix LabResult
|
5 years ago |
haroon amjad
|
8cd3ae915b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
haroon amjad
|
468bb0356c
|
updates & fixes
|
5 years ago |
Mohammad Aljammal
|
6ae2bfe790
|
Merge branch 'fix_insurance_update' into 'diplomatic-quarter-live'
remove updated button
See merge request Cloud_Solution/diplomatic-quarter!164
|
5 years ago |
Mohammad Aljammal
|
14f92f6c58
|
remove updated button
|
5 years ago |
Mohammad Aljammal
|
1b90ba54df
|
Merge branch 'fix_insurance_update' into 'diplomatic-quarter-live'
Fix insurance update
See merge request Cloud_Solution/diplomatic-quarter!163
|
5 years ago |
Mohammad Aljammal
|
554ed1b50a
|
fix insurance update
|
5 years ago |
Mohammad Aljammal
|
9fecf8e89f
|
fix insurance update
|
5 years ago |
Mohammad Aljammal
|
935e72975c
|
add new privilege
|
5 years ago |
enadhilal
|
727940c5c6
|
fixed merging issues
|
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 |
haroon amjad
|
849723ffd3
|
Merge branch 'pharmacy-Fatima' into 'pharmacy'
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!162
|
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
|
ed68eed9df
|
added links for profile
|
5 years ago |
Mohammad Aljammal
|
03a81c7832
|
Merge branch 'merge_diplomatic_quarter_live_to_master' into 'master'
Merge diplomatic quarter live to master
See merge request Cloud_Solution/diplomatic-quarter!161
|
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 |
Mohammad Aljammal
|
5f12eab870
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
added countdown timer in my appointments
See merge request Cloud_Solution/diplomatic-quarter!159
|
5 years ago |
haroon amjad
|
a1f91d99b3
|
added countdown timer in my appointments
|
5 years ago |