Sultan Khan
|
d69b3676a4
|
weather indicator in progress
|
4 years ago |
hussam al-habibeh
|
64cbae3602
|
Search
|
4 years ago |
Mohammad Aljammal
|
1394ceed3c
|
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
Pharmacy module feature home page
See merge request Cloud_Solution/diplomatic-quarter!147
|
4 years ago |
|
Mohammad Aljammal
|
b8df3ef9e3
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!148
|
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
|
efae246566
|
Merge branch 'images_info' into 'diplomatic-quarter-live'
Added info images description
See merge request Cloud_Solution/diplomatic-quarter!145
|
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 |
|
Mohammad Aljammal
|
76a9b7b9e2
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!144
|
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
|
5d72ff7670
|
Merge branch 'images_info' into 'diplomatic-quarter-live'
add images info
See merge request Cloud_Solution/diplomatic-quarter!143
|
4 years ago |
|
Mohammad Aljammal
|
3daef6e53f
|
add images info
|
4 years ago |
|
Mohammad Aljammal
|
dc898a799d
|
Add Privileges
|
4 years ago |
|
Mohammad Aljammal
|
dbca686adf
|
Merge branch 'hhc_cmc' into 'master'
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!142
|
4 years ago |
Elham Rababah
|
d9ffc5d3da
|
remove duplicated package
|
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 |
|
Mohammad Aljammal
|
bda6f58aa3
|
Merge branch 'Haroon' into 'master'
working on ereferral
See merge request Cloud_Solution/diplomatic-quarter!141
|
4 years ago |
|
haroon amjad
|
4f1f7dcefd
|
ereferral implementation completed
|
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
|
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 |
|
Mohammad Aljammal
|
4b435199fc
|
Merge branch 'Haroon' into 'master'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!139
|
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
|
e42b437420
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!137
|
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
|
1e1677a365
|
naming issue fix
|
4 years ago |
|
Elham Rababah
|
05deaa6322
|
Address Added Successfully
|
4 years ago |
|
Sultan Khan
|
078183c1fb
|
not authenticated page updated
|
4 years ago |
|
Elham Rababah
|
68e4b92717
|
Address Added Successfully
|
4 years ago |
|
Sultan Khan
|
de2a5e55eb
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
7d3c1ac852
|
weather indicator updated
|
4 years ago |
|
Sultan Khan
|
648d9d245d
|
health weather indicator
|
4 years ago |
|
Zohaib Kambrani
|
96afe340e7
|
Merge branch 'hmg_internet_fix' into ZohaibIqbalKambrani
* hmg_internet_fix:
Wifi internet
no message
|
4 years ago |
|
Zohaib Kambrani
|
18f5203f56
|
Merge branch 'master' into ZohaibIqbalKambrani
# Conflicts:
# ios/Flutter/.last_build_id
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/core/service/medical/my_balance_service.dart
# lib/core/service/medical/prescriptions_service.dart
# lib/core/viewModels/medical/my_balance_view_model.dart
# lib/core/viewModels/medical/prescriptions_view_model.dart
# lib/core/viewModels/project_view_model.dart
# lib/main.dart
# lib/pages/BookAppointment/BookSuccess.dart
# lib/pages/DrawerPages/family/my-family.dart
# lib/pages/feedback/send_feedback_page.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/pages/login/register-info.dart
# lib/pages/medical/balance/advance_payment_page.dart
# lib/pages/medical/balance/confirm_payment_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/pages/medical/prescriptions/prescription_items_page.dart
# lib/pages/settings/general_setting.dart
# lib/pages/settings/profile_setting.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/services/authentication/auth_provider.dart
# lib/services/permission/permission_service.dart
# lib/theme/theme_value.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/buttons/button.dart
# lib/widgets/buttons/defaultButton.dart
# lib/widgets/buttons/floatingActionButton.dart
# lib/widgets/buttons/mini_button.dart
# lib/widgets/buttons/secondary_button.dart
# lib/widgets/data_display/medical/LabResultWidget.dart
# lib/widgets/data_display/medical/doctor_card.dart
# lib/widgets/data_display/medical/laboratory_result_widget.dart
# lib/widgets/drawer/app_drawer_widget.dart
# lib/widgets/in_app_browser/InAppBrowser.dart
# pubspec.yaml
|
4 years ago |
|
Zohaib Kambrani
|
55ad82147f
|
Wifi internet
|
4 years ago |
|
Zohaib Kambrani
|
15918e2d62
|
no message
|
4 years ago |