Commit Graph

1493 Commits (c07a8f54c78e9671982f7848ed05b2ec239bfb3c)
 

Author SHA1 Message Date
Sikander Saleem c07a8f54c7 merge changes-2 3 years ago
Sikander Saleem 14561d0ac6 merge changes-1 3 years ago
Sikander Saleem a5d40f090a improvements-test 3 years ago
Mirza.Shafique 2665e4cd0c Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 3 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 3 years ago
Sikander Saleem 2cb59a286f Merge branch 'login_design_sikander' into development_new_design_2.0 3 years ago
Sikander Saleem 473315f8a1 improvements 3 years ago
Mirza.Shafique 3c438406b5 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
3 years ago
Sikander Saleem 53e4815866 no auth ui modifications 3 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 3 years ago
Sultan khan 772dcba287 Merge branch 'Aug_fixes' into 'development'
PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.

See merge request Cloud_Solution/diplomatic-quarter!338
3 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
3 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 3 years ago
Sultan khan 54e1d51f18 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!337
3 years ago
Zohaib Iqbal Kambrani 5f1d753895 no message 3 years ago
Sikander Saleem 907d90b987 login ui and forgot password ui added. 3 years ago
Elham Rababh 7ad4e03c1a PAP-715 : Y –axis and X –axis values should be display in the yearly graph details. 3 years ago
Mohammad Aljammal 9b3a679948 Merge branch 'fix-bugs' into 'development'
fix bugs

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

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

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

See merge request Cloud_Solution/diplomatic-quarter!333
3 years ago
Sultan khan d83ae18d7b Merge branch 'pharmacy-bugs' into 'development'
jira bugs

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

See merge request Cloud_Solution/diplomatic-quarter!331
3 years ago
Zohaib Iqbal Kambrani 882d5f090a Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
  no message
3 years ago
mosazaid 2e33c2b240 fix bugs 3 years ago
Mirza.Shafique b0dfbef52a Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
3 years ago
Mirza.Shafique d37f225c1b Home page 1.2 3 years ago
Sikander Saleem 3707b13986 login type ui & icons added. 3 years ago
Sultan khan 9f355440fc Merge branch 'Aug_fixes' into 'development'
Aug fixes

See merge request Cloud_Solution/diplomatic-quarter!330
3 years ago
Elham Rababh 5d05b09345 PAP-712 : fixes on Blood sugar 3 years ago
Mirza.Shafique 090556f4d1 Merge branch 'mirza_home_page' into development_new_design_2.0 3 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 3 years ago
Sikander Saleem 8b2feb03ea last login and login options ui. 3 years ago
Elham Rababh 86414b46fd PAP-304 : show CBC details 3 years ago
Elham Rababh 52816a9cfe PAP-723 : system should display the empty graph in the blood pressure screen. 3 years ago
Elham Rababh f824063e82 PAP-726 : fix show Arabic values for the select Arm 3 years ago
Elham Rababh f92567f877 PAP-718 : fix show data after save 3 years ago
Elham Rababh f830bfdb19 PAP-722 : fix send email 3 years ago
Sikander Saleem 1ec48b9598 Poppins font added. 3 years ago
Sultan khan 9196367da4 Merge branch 'bug_fix_mirza' into 'development'
Medical Profile Buttons Lock

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

See merge request Cloud_Solution/diplomatic-quarter!328
3 years ago