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 |
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 |
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 |
Mohammad Aljammal
|
77dcb918c3
|
Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
|
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
|
4e2c955b09
|
add missing translation
|
4 years ago |
haroon amjad
|
dfa1952f4d
|
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
|
4 years ago |
hussam al-habibeh
|
5dc3c53550
|
mousa and hussam branch
|
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 |
mosazaid
|
7ee7ef58c4
|
working on dynamic title on pharmacy
|
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 |
mosazaid
|
2a91ae787f
|
commit
|
4 years ago |
hussam al-habibeh
|
8b8207cb0d
|
search
|
4 years ago |
Sultan Khan
|
e34a5c3c13
|
multiple login calls fixed
|
4 years ago |
Sultan Khan
|
f5b7d35f23
|
bug fixes
|
4 years ago |
Sultan Khan
|
d69b3676a4
|
weather indicator in progress
|
4 years ago |
hussam al-habibeh
|
64cbae3602
|
Search
|
4 years ago |
Sultan Khan
|
81c8239412
|
bug fixes
|
4 years ago |
Sultan Khan
|
fc0117754d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
1c23e28081
|
fix merge issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
269f682bd5
|
Added info images description
|
4 years ago |
mosazaid
|
35d0d3e441
|
finsi lakum points task
|
4 years ago |
haroon amjad
|
f1a8e09a59
|
Added info images description
|
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 |
Sultan Khan
|
3a055aa02b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
79c17de0de
|
ltr issue fixed
|
4 years ago |
Mohammad Aljammal
|
3daef6e53f
|
add images info
|
4 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
|
4 years ago |
Elham Rababah
|
ea195ea9bf
|
Finish translate CMC HHC
|
4 years ago |
haroon amjad
|
ff0d66ccdb
|
Covid test translations
|
4 years ago |
haroon amjad
|
4f1f7dcefd
|
ereferral implementation completed
|
4 years ago |
haroon amjad
|
65fbd7af8e
|
referral finalised
|
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
|
951c77feb5
|
working on lakum account
|
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 |
Elham Rababah
|
5bf63174c9
|
First step from translations
|
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 |