Commit Graph

631 Commits (d9759560c396caf10f2ec43ca5f5dcfb56cba9d3)

Author SHA1 Message Date
Mohammad Aljammal d9759560c3 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/login/login.dart
4 years ago
Mohammad Aljammal 02d72fa27c fix issues 4 years ago
Sultan Khan 0f594059b5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
haroon amjad a7dc2fdfd1 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
haroon amjad 781fd1c287 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan 3aa592e2b0 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 9a578cafc2 bug fixes 4 years ago
Sultan Khan b759758a68 bug fixes 4 years ago
Mohammad Aljammal 3860a08b53 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix issues

See merge request Cloud_Solution/diplomatic-quarter!188
4 years ago
Mohammad Aljammal f38f53587b fix issues 4 years ago
Haroon Amjad 3308aa47e1 fixes 4 years ago
Sultan Khan 9e3db622fa login loader issue fixed 4 years ago
Mohammad Aljammal 3122f2438b fix import dialog 4 years ago
Mohammad Aljammal 19f12116c4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 4 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 4 years ago
haroon amjad 965c97d262 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad bf999e611b my appointment fix 4 years ago
Sultan Khan d779c6dd0a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan a2e385f282 family file drawer 4 years ago
Haroon Amjad b9269f525a hot fixes 4 years ago
Haroon Amjad c67d41701d Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Haroon Amjad 5606c88715 hot fixes 4 years ago
Mohammad Aljammal 92e6275162 Add Confirm send email dialog 4 years ago
Haroon Amjad 81b51bef51 Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
Mohammad Aljammal 4e823c2be4 fix chart and duplicated data in Patient Lab Result 4 years ago
haroon amjad 051bd1e23f Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljammal 4a43bcefe1 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
remove ErOptions

See merge request Cloud_Solution/diplomatic-quarter!179
4 years ago
Mohammad Aljammal a6d3fce6fc remove ErOptions 4 years ago
haroon amjad b13a56ffbd Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 951d9b553f fixes & updates 4 years ago
Sultan Khan 71592adf32 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 1f0d01b6cc language issue fixed 4 years ago
haroon amjad f394433b6e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 9d046fd971 updates & fixes 4 years ago
Mohammad Aljammal 97776ce99b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix 4 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 4 years ago
haroon amjad 75de755ccd Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/paymentService/payment_service.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 08aa2de69b fix Prescriptions Service and design issues 4 years ago
Mohammad Aljammal a2ec01be5d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/landing/home_page.dart
	lib/pages/medical/radiology/radiology_details_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 2f77592bac fix Prescriptions Service and design issues 4 years ago
haroon amjad 740a294867 Translation & bug fixes 4 years ago
Mohammad Aljammal 62b923b25e fix send rad report email 4 years ago
Mohammad Aljammal 5083080ba3 fix vital sign details 4 years ago
haroon amjad 1db5b15dcd Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon 4 years ago
haroon amjad 9ecaaa1b12 radiology fix in appointment details 4 years ago
Sultan Khan 9d9d77ee3a bug fixes 4 years ago
Sultan Khan c813deea29 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
haroon amjad d14e7e5223 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan e28209d4e8 bug fixes 4 years ago
Haroon Amjad 9d3c64200e fixes 4 years ago