Commit Graph

1284 Commits (60b1688bb4ff81264f69aeb8c23387d551366782)
 

Author SHA1 Message Date
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
Mohammad Aljammal 82724883fb Merge branch 'ZohaibIqbalKambrani' into 'master'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!183
4 years ago
Mohammad Aljammal fc00361db1 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!184
4 years ago
Zohaib Kambrani 53775d113d commented code offers and packages 4 years ago
Zohaib Kambrani 9947b30d3f fix merge conflict 4 years ago
Zohaib Kambrani c534061c4f no message 4 years ago
Zohaib Kambrani 9ea779e48a no message 4 years ago
Zohaib Kambrani b7088f70cd Merge master in to my branch with Geofence iOS 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
Mohammad Aljammal 7345a289ed Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!182
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 621abe3ca2 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Add Confirm send email dialog

See merge request Cloud_Solution/diplomatic-quarter!181
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 e35f706be3 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
fix chart and duplicated data in Patient Lab Result

See merge request Cloud_Solution/diplomatic-quarter!180
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
Zohaib Kambrani 67f4b4e167 iOS Geofence in progress 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
Zohaib Kambrani 8457972fda no message 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
Mohammad Aljammal 87ae3f906c Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!178
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
Sultan Khan 2c50402aa8 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 9d76ee0154 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Hot fix

See merge request Cloud_Solution/diplomatic-quarter!177
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 4a12ac4163 Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon

See merge request Cloud_Solution/diplomatic-quarter!174
4 years ago
Mohammad Aljammal b25bdbb6fa fix LiveChatPage Service LabOrderResult MedicineSearch issues 4 years ago
Zohaib Kambrani 92ba977fca no message 4 years ago
mosazaid c058cf0e93 finish address add/edit/delete/select 4 years ago
Sultan Khan 557b8e814f voice command 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
mosazaid 6ac8d67b83 finish address add/edit/delete/select 4 years ago
Zohaib Kambrani c10d024700 no message 4 years ago
Mohammad Aljammal 7bf181f3a6 Merge branch 'hot_fix' into 'diplomatic-quarter-live'
Hot fix

See merge request Cloud_Solution/diplomatic-quarter!175
4 years ago
Mohammad Aljammal 08aa2de69b fix Prescriptions Service and design issues 4 years ago
Zohaib Kambrani 8d5d55a150 Geofencing in progress 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