Mohammad Aljammal
|
f9ac57e5b9
|
Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Hot fix
See merge request Cloud_Solution/diplomatic-quarter!169
|
4 years ago |
|
Mohammad Aljammal
|
eca2266f7b
|
hot fixing
|
4 years ago |
Sultan Khan
|
21ccf1ef86
|
bug fixes
|
4 years ago |
hussam al-habibeh
|
e85b21c08f
|
parent_categorise_page update
|
4 years ago |
haroon amjad
|
c4bb75eab4
|
Doctor rating fixed
|
4 years ago |
|
haroon amjad
|
8d20762050
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
33956db22a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
|
4 years ago |
|
haroon amjad
|
b55681a056
|
Working on steps tracking
|
4 years ago |
|
Mohammad Aljammal
|
f7ee16f115
|
Merge branch 'privileges' into 'master'
Privileges
See merge request Cloud_Solution/diplomatic-quarter!167
|
4 years ago |
|
Mohammad Aljammal
|
a1e92e1fdd
|
fix merge issue
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
9b8599a2cf
|
remove load user from SplashScreen
|
4 years ago |
|
Mohammad Aljammal
|
735ed91f9c
|
Merge branch 'fix_insurance_update' into 'diplomatic-quarter-live'
fix LabResult
See merge request Cloud_Solution/diplomatic-quarter!166
|
4 years ago |
|
Mohammad Aljammal
|
4d203c8a5b
|
fix LabResult
|
4 years ago |
|
haroon amjad
|
8cd3ae915b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
468bb0356c
|
updates & fixes
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
14f92f6c58
|
remove updated button
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
554ed1b50a
|
fix insurance update
|
4 years ago |
|
Mohammad Aljammal
|
9fecf8e89f
|
fix insurance update
|
4 years ago |
|
Mohammad Aljammal
|
935e72975c
|
add new privilege
|
4 years ago |
|
haroon amjad
|
e495d3e5ad
|
Health Data integration implementing
|
4 years ago |
enadhilal
|
727940c5c6
|
fixed merging issues
|
4 years ago |
|
haroon amjad
|
cf6686e413
|
Merge branch 'master' into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
mosazaid
|
378562b781
|
adding some changes in order pages like translate texts
|
4 years ago |
|
enadhilal
|
9c55571072
|
Merge branch 'pharmacy' into enad_pharmacy2
|
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 |
haroon amjad
|
849723ffd3
|
Merge branch 'pharmacy-Fatima' into 'pharmacy'
Pharmacy fatima
See merge request Cloud_Solution/diplomatic-quarter!162
|
4 years ago |
|
enadhilal
|
888a74fb9b
|
add these pages
Product Tile Component
Product Detail Page
Wishlist Page
Reviews Page
Brands Page + Search
|
4 years ago |
Fatimah Alshammari
|
ed68eed9df
|
added links for profile
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
2e2a29145c
|
fix merge issues
|
4 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
|
4 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
|
4 years ago |
|
haroon amjad
|
59aba6608d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
|
haroon amjad
|
a1f91d99b3
|
added countdown timer in my appointments
|
4 years ago |
|
Fatimah Alshammari
|
706980248a
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
|
Mohammad Aljammal
|
c65477f7d9
|
Merge branch 'revert-133450e5' into 'master'
Revert "Merge branch 'pharmacy-hussam' into 'master'"
See merge request Cloud_Solution/diplomatic-quarter!158
|
4 years ago |
|
Mohammad Aljammal
|
77dcb918c3
|
Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
|
4 years ago |
|
Fatimah Alshammari
|
9b8103bfd6
|
fixe order and order details
|
4 years ago |
|
Mohammad Aljammal
|
133450e503
|
Merge branch 'pharmacy-hussam' into 'master'
Pharmacy hussam
See merge request Cloud_Solution/diplomatic-quarter!149
|
4 years ago |
|
Mohammad Aljammal
|
092f415457
|
Merge branch 'fix_issues' into 'diplomatic-quarter-live'
add missing translation
See merge request Cloud_Solution/diplomatic-quarter!157
|
4 years ago |
|
Mohammad Aljammal
|
47e4b99f11
|
fix issues
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
7f23f356f1
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!151
|
4 years ago |
|
Mohammad Aljammal
|
0bf47dcc76
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
See merge request Cloud_Solution/diplomatic-quarter!156
|
4 years ago |
|
Mohammad Aljammal
|
4e2c955b09
|
add missing translation
|
4 years ago |
|
haroon amjad
|
9575a236d4
|
Merge branch 'pharmacy-hussam' into 'pharmacy'
Pharmacy hussam
See merge request Cloud_Solution/diplomatic-quarter!155
|
4 years ago |
|
haroon amjad
|
dfa1952f4d
|
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
|
4 years ago |