Zohaib Kambrani
|
1155466d19
|
Packages and Offer Slider at home
|
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 |
|
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
Mohammad Aljammal
|
1df9ed4a09
|
Merge branch 'child_vaccines' into 'master'
done child Vaccination
See merge request Cloud_Solution/diplomatic-quarter!136
|
4 years ago |
Mohammad Aljammal
|
54d8965773
|
done child Vaccination
|
4 years ago |
|
Mohammad Aljammal
|
3c54ed00f9
|
Merge branch 'child_vaccines' into 'master'
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!134
|
4 years ago |
|
Mohammad Aljammal
|
49974f81db
|
add translations to child Vaccination
|
4 years ago |
|
Mohammad Aljammal
|
fa01d132c7
|
merger DQ live and fix some issues on Child Vaccines
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
47c980a412
|
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
add Radiology translations and colors
See merge request Cloud_Solution/diplomatic-quarter!131
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
b6d2878cf1
|
add Radiology translations and colors
|
4 years ago |
|
Mohammad Aljammal
|
6cb3224226
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!129
|
4 years ago |
Sultan Khan
|
22676fcbd1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
5bb780c4ac
|
push
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
b504f379de
|
fix lab result translations and colors
|
4 years ago |
|
Mohammad Aljammal
|
2731c5b1d4
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!127
|
4 years ago |
|
Sultan Khan
|
d6a0188c76
|
fingerprint
|
4 years ago |
|
Sultan Khan
|
7c33c06c0c
|
fingerprint
|
4 years ago |
|
Sultan Khan
|
1b678e0aca
|
fingerprint
|
4 years ago |
|
Sultan Khan
|
6a14214a0f
|
no message
|
4 years ago |
|
Mohammad Aljammal
|
92b18bce07
|
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix vital Sign
See merge request Cloud_Solution/diplomatic-quarter!126
|
4 years ago |
|
Mohammad Aljammal
|
0ac599ea1c
|
fix vital Sign
|
4 years ago |
|
Mohammad Aljammal
|
caf930050f
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!125
|
4 years ago |
haroon amjad
|
10025103ac
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
21c7c94ef2
|
updates & fixes
|
4 years ago |
|
Mohammad Aljammal
|
9fcf87126a
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!124
|
4 years ago |
|
Sultan Khan
|
b61e734f80
|
feedback permission
|
4 years ago |
|
Sultan Khan
|
6bbdf05f90
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
857fc813cd
|
button feedback
|
4 years ago |
|
Mohammad Aljammal
|
51a03b83fa
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
advance payment & payment flow issues fixed
See merge request Cloud_Solution/diplomatic-quarter!123
|
4 years ago |
|
Sultan Khan
|
29eaa26b36
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
571bda9100
|
permission
|
4 years ago |
|
haroon amjad
|
d284ceac04
|
advance payment & payment flow issues fixed
|
4 years ago |
|
Mohammad Aljammal
|
706cd13656
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!122
|
4 years ago |
|
Sultan Khan
|
8429f83d7c
|
registration done
|
4 years ago |
|
Sultan Khan
|
391e178484
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
8d499704dc
|
family file changes
|
4 years ago |
|
Mohammad Aljammal
|
2cb37bf8a0
|
Merge branch 'fix_prescriptions' into 'diplomatic-quarter-live'
Fix prescriptions
See merge request Cloud_Solution/diplomatic-quarter!121
|
4 years ago |
|
Mohammad Aljammal
|
91cada6901
|
fix Advance Payment
|
4 years ago |
|
Mohammad Aljammal
|
dcbc0de69f
|
fix prescription
|
4 years ago |
|
Mohammad Aljammal
|
4e31a79019
|
Merge branch 'fix_master' into 'master'
fix merge issues
See merge request Cloud_Solution/diplomatic-quarter!120
|
4 years ago |
|
Mohammad Aljammal
|
f70ca95a38
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
85df92a0ca
|
Merge branch 'fix_master' into 'master'
Fix master
See merge request Cloud_Solution/diplomatic-quarter!119
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
eb5727ef8a
|
fix master
|
4 years ago |