Commit Graph

562 Commits (39ba2cfde72a51ec2b8a10b45ba8a20f41c702a9)

Author SHA1 Message Date
Haroon Amjad 47e521fe1d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/feedback/send_feedback_page.dart
#	lib/pages/landing/home_page.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
Sultan khan a67e320a8e Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!333
5 years ago
hussam al-habibeh 6dc0d89f61 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
	lib/uitl/utils.dart
5 years ago
hussam al-habibeh 981e78936e jira bugs 5 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

See merge request Cloud_Solution/diplomatic-quarter!329
5 years ago
Sultan khan f54b9a63aa Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!328
5 years ago
Mirza.Shafique 2fda47baf6 Medical Profile Buttons Lock 5 years ago
Haroon Amjad 213d104d57 Covid test procedure selection implemented 5 years ago
Sultan khan 487d63ec7f Merge branch 'bug_fix_mirza' into 'development'
Check-In NFC

See merge request Cloud_Solution/diplomatic-quarter!326
5 years ago
Sikander Saleem eb9005510d bug fixes and insurance approvals improvements. 5 years ago
Sultan Khan 3c2539d5b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 14ef096c32 changes and fixes 5 years ago
Mirza.Shafique b31813770e Check-In NFC done 5 years ago
Haroon Amjad fde658fd5d Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
5 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 5 years ago
Mirza.Shafique e934e7cd2c Merge Fix 5 years ago
haroon amjad 4504b4bf75 config 5 years ago
haroon amjad f310f9d0ab config 5 years ago
haroon amjad 0d2a91c124 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
hussam al-habibeh fefde8f575 jira bugs 5 years ago
haroon amjad 7b6270c67f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad bcb4f48785 build fix 5 years ago
Sultan Khan b4a7235fc8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
hussam al-habibeh 854352d9ce jira bugs 5 years ago
Sikander Saleem 1f01f40ad8 PAP-681 fixed, H2O Unit changing & reflection. 5 years ago
Sultan Khan da2df9b348 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan bcabd81f88 BUG FIXES 5 years ago
Mohammad Aljammal 25d5105caf Merge branch 'Apr-fixes' into 'development'
PAP-607: fix issue

See merge request Cloud_Solution/diplomatic-quarter!312
5 years ago
Elham Rababah 2a47564c37 PAP-607: fix issue 5 years ago
Fatimah Alshammari 174e0d9673 Merge branch 'development' into pharmacy-Fatima 5 years ago
Fatimah Alshammari 2481e4c9ea fixed categories issues and home page button 5 years ago
Sultan Khan 8c9c309abb bug fixes 5 years ago
Sultan Khan cd7845b1a4 bug fix 5 years ago
haroon amjad 6b675acc94 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/feedback/send_feedback_page.dart
5 years ago
haroon amjad 353a5157f2 fixes 5 years ago
Sultan Khan 0245875358 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 3d6858d0ec bug fixes 5 years ago
Fatimah Alshammari 235fdfba54 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 5 years ago
haroon amjad f754e48034 Merge branch 'development' into Haroon
# Conflicts:
#	lib/widgets/in_app_browser/InAppBrowser.dart
5 years ago
haroon amjad 49c454b132 fixes 5 years ago
mosazaid b623bd0dce Merge branch 'development' into fix_bugs 5 years ago
mosazaid e5474b3062 fix perscription pages bugs 5 years ago
Mohammad Aljammal 126fad61c0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_eye_balance
 Conflicts:
	lib/core/service/client/base_app_client.dart
5 years ago
Mohammad Aljammal 53e4dfa99d Merge branch 'ZohaibIqbalKambrani' into 'development'
Zohaib iqbal kambrani

See merge request Cloud_Solution/diplomatic-quarter!292
5 years ago
Mohammad Aljammal 7c1fd8043b fix chart and eye and balance 5 years ago
Zohaib Iqbal Kambrani b91ce441e2 Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts: Resolved
#	lib/core/model/pharmacies/order_model.dart
#	lib/core/service/client/base_app_client.dart
#	lib/main.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
#	lib/pages/pharmacy/order/TrackDriver.dart
#	lib/routes.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
#	lib/widgets/in_app_browser/InAppBrowser.dart
#	lib/widgets/others/app_scaffold_widget.dart
#	pubspec.yaml
5 years ago
hussam al-habibeh f9b8191a5e jira bugs 5 years ago
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 5 years ago