Commit Graph

1471 Commits (54e1d51f18ed8ed00fd79addcfa5045742e2dabc)
 

Author SHA1 Message Date
Sultan khan 54e1d51f18 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!337
5 years ago
Zohaib Iqbal Kambrani 5f1d753895 no message 5 years ago
Mohammad Aljammal 9b3a679948 Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!336
5 years ago
Mohammad Aljammal b34402ffa8 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!335
5 years ago
Mohammad Aljammal ed5079e3a0 Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!334
5 years ago
mosazaid e9dbc4be7a fix bugs 5 years ago
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
hussam al-habibeh 50d3a42743 fixing dashboard issue 5 years ago
hussam al-habibeh 1ed76e91aa fixing dashboard issue 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
Sultan khan d83ae18d7b Merge branch 'pharmacy-bugs' into 'development'
jira bugs

See merge request Cloud_Solution/diplomatic-quarter!332
5 years ago
hussam al-habibeh d5c76b5400 jira bugs 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 08e0ce52c8 Merge branch 'development' into ZohaibIqbalKambrani
* development:
  fix bugs
5 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
Mohammad Aljammal 4ac6bf628b Merge branch 'fix-bugs' into 'development'
fix bugs

See merge request Cloud_Solution/diplomatic-quarter!331
5 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
5 years ago
mosazaid 2e33c2b240 fix bugs 5 years ago
Sultan khan 9f355440fc Merge branch 'Aug_fixes' into 'development'
Aug fixes

See merge request Cloud_Solution/diplomatic-quarter!330
5 years ago
Elham Rababh 5d05b09345 PAP-712 : fixes on Blood sugar 5 years ago
Elham Rababh 86414b46fd PAP-304 : show CBC details 5 years ago
Elham Rababh 52816a9cfe PAP-723 : system should display the empty graph in the blood pressure screen. 5 years ago
Elham Rababh f824063e82 PAP-726 : fix show Arabic values for the select Arm 5 years ago
Elham Rababh f92567f877 PAP-718 : fix show data after save 5 years ago
Elham Rababh f830bfdb19 PAP-722 : fix send email 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
Zohaib Iqbal Kambrani dbf525c484 no message 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
Sultan khan 6c77edfa08 Merge branch 'bug_fixing' into 'development'
bug fixes and insurance approvals improvements.

See merge request Cloud_Solution/diplomatic-quarter!327
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 c3229b1dd8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into bug_fix_mirza 5 years ago
Mirza.Shafique 107d50826c nfc package test 5 years ago
Mirza.Shafique fb0a67e5bd PAP 828 and 792 issue fix 5 years ago
Sultan khan 2447d006d2 Merge branch 'bug_fix_mirza' into 'development'
Merge fix mirza

See merge request Cloud_Solution/diplomatic-quarter!325
5 years ago
Mirza.Shafique e934e7cd2c Merge Fix 5 years ago
Mirza.Shafique 947b25a68c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into bug_fix_mirza 5 years ago
haroon amjad 7cf66934bc Merge branch 'Haroon' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 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
Sultan khan 81f751f552 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!324
5 years ago
Sultan khan 683e94edea Merge branch 'pharmacy-bugs' into 'development'
jira bugs

See merge request Cloud_Solution/diplomatic-quarter!323
5 years ago