Commit Graph

829 Commits (f03adb37ce46c6b704689a8968d021eec3dd68cc)
 

Author SHA1 Message Date
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
Zohaib Kambrani 27182ee8db no message 4 years ago
Elham Rababah ed56476d81 second step from location fixes 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 5fdb357a57 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!135
4 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 4 years ago
haroon amjad 97b8aeeff5 Version Control finished 4 years ago
haroon amjad a03d5c6d57 App initial release to stores 4 years ago
Sultan Khan e7c862c801 health weather indicator 4 years ago
Elham Rababah 7aa7af6de7 finish CMC module 4 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Elham Rababah fd80afeb5a finish hhc module 4 years ago
Elham Rababah 3ef22be7da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababah a87855f445 Fix issues on hhc module 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 8b38ce2267 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!133
4 years ago
Sultan Khan 5e6bcadec0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 603833db37 login changes 4 years ago
Sultan Khan 340b9770c8 login 4 years ago
haroon amjad e5feef8a9d Updates & UI Fixes 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
haroon amjad 01512e6332 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 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
haroon amjad 8400254020 Merge branch 'pharmacy-Fatima' into 'pharmacy'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!130
4 years ago
Fatimah Alshammari d328c74fc4 fix order and orderdetails 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
haroon amjad ebb8a8fa2c Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 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