Commit Graph

1306 Commits (24b7a8a4c47ee2e2aabb9cc2ba8307b1be87a5f9)

Author SHA1 Message Date
Sikander Saleem ff55ae1908 improvements 5 years ago
Sikander Saleem bb3d11ccf8 remove spaces. 5 years ago
Sikander Saleem 56c0adaada Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
5 years ago
Sikander Saleem bb9d1bfcd5 improvements 5 years ago
hussam al-habibeh 4b90f16ab9 baby age in ovulation period 5 years ago
Fatimah Alshammari e86dfd1a34 Merge branch 'development' into fatima-new 5 years ago
Fatimah Alshammari 86d67247be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Fatimah Alshammari 0d3f6237ce fixed issues 5 years ago
Sikander Saleem 80c50e29bf Merge branch 'login_design_sikander' into development_new_design_2.0
# Conflicts:
#	lib/config/config.dart
#	lib/pages/landing/landing_page.dart
5 years ago
Sikander Saleem 4db432b351 lab results working(cont.) & improvements 5 years ago
Sultan Khan b1453b52e3 registration 5 years ago
Mirza.Shafique 38465eaafb Home page icons and drawer 5 years ago
Zohaib Iqbal Kambrani 429fcb1e60 Merge branch 'development' into ZohaibIqbalKambrani
* development: (32 commits)
  changes
  package name changed
  Jira Fixes
  Jira fixes
  PAP-664
  PAP-664
  PAP-664
  langauge issue
  bug fix
  PAP-777
  PAP-729
  fix button
  fix translate issues
  CONFIG
  PAP-715 : Y –axis and X –axis values should be display in the yearly graph details.
  bug fixes
  fix bugs
  fixing dashboard issue
  fixing dashboard issue
  jira bugs
  ...

# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
#	lib/uitl/utils.dart
5 years ago
hussam al-habibeh d3868844de Medication availability 5 years ago
Mirza.Shafique 1bea9d39b5 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 06f877b8d4 Home page new design & drawer 5 years ago
Sultan Khan 57864f949d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 5 years ago
Sultan Khan bd85854fa4 changes 5 years ago
Zohaib Iqbal Kambrani 10a147860c no message 5 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 5 years ago
Sultan Khan 97d7f9225e package name changed 5 years ago
haroon amjad 709877b5f1 Merge branch 'development' into Haroon
# Conflicts:
#	lib/pages/login/forgot-password.dart
#	lib/pages/medical/radiology/radiology_details_page.dart
5 years ago
haroon amjad 90db04cee1 Jira Fixes 5 years ago
Fatimah Alshammari b8ba80b361 Merge branch 'fatima-new' into development 5 years ago
Fatimah Alshammari 39ba2cfde7 fixed issues. 5 years ago
Sikander Saleem 2d64426cd4 Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 70614d3555 merge improvements-1. 5 years ago
haroon amjad 5007064105 Jira fixes 5 years ago
Mirza.Shafique 99c6318410 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 2d62822536 Medical Profile Page improvements 5 years ago
Sikander Saleem f482595d6b merge improvements. 5 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Mirza.Shafique 4ebf5f900b improvements. 5 years ago
Mirza.Shafique 32e867421f Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
# Conflicts:
#	lib/uitl/date_uitl.dart
#	lib/uitl/translations_delegate_base.dart
5 years ago
Mirza.Shafique e9e3b079b3 Medical Profile Complete 1.1 5 years ago
hussam al-habibeh 02df6f4d85 PAP-664 5 years ago
hussam al-habibeh 60aaf2a31a Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-bugs
 Conflicts:
	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
5 years ago
hussam al-habibeh 352fd912de PAP-664 5 years ago
hussam al-habibeh 29249dc9a9 PAP-664 5 years ago
Sultan Khan e5fb16ad69 langauge issue 5 years ago
Mirza.Shafique bbaeec5b85 Medical Profile Complete 5 years ago
Sikander Saleem f6ae7ed770 merge changes-4 5 years ago
Sikander Saleem 889ae24f07 merge changes-3 5 years ago
Sikander Saleem c07a8f54c7 merge changes-2 5 years ago
Sikander Saleem 14561d0ac6 merge changes-1 5 years ago
Sultan Khan c9fe036b99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 7c398ba40d bug fix 5 years ago
Sikander Saleem a5d40f090a improvements-test 5 years ago
hussam al-habibeh 146fc5d2b2 PAP-777 5 years ago
Mirza.Shafique 2665e4cd0c Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0 5 years ago
Mirza.Shafique a20185b2b9 Home page 1.4 (Homepage changes) 5 years ago
Sikander Saleem 2cb59a286f Merge branch 'login_design_sikander' into development_new_design_2.0 5 years ago
Sikander Saleem 473315f8a1 improvements 5 years ago
hussam al-habibeh 6ea06ce442 PAP-729 5 years ago
Mirza.Shafique 3c438406b5 Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
#	lib/uitl/translations_delegate_base.dart
5 years ago
Sikander Saleem 53e4815866 no auth ui modifications 5 years ago
Mirza.Shafique 49bfa2e9a7 Home page 1.3 5 years ago
Elham Rababh 8b8e239d3f fix button 5 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 5 years ago
Elham Rababh b01961e45f fix translate issues 5 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan d6fd03b571 CONFIG 5 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
5 years ago
Sultan khan ba32a37a17 Merge branch 'ZohaibIqbalKambrani' into 'development'
RRT in progress

See merge request Cloud_Solution/diplomatic-quarter!339
5 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 5 years ago
Sultan Khan 6534ca8349 Merge branches 'sultan-patientapp' and 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
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
Sikander Saleem 907d90b987 login ui and forgot password ui added. 5 years ago
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Elham Rababh 7ad4e03c1a PAP-715 : Y –axis and X –axis values should be display in the yearly graph details. 5 years ago
Sultan Khan 23ca95b9b6 bug fixes 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 6442ce178d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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 8766a69928 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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
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
5 years ago
Mirza.Shafique d37f225c1b Home page 1.2 5 years ago
Sikander Saleem 3707b13986 login type ui & icons added. 5 years ago
Sultan Khan 446f86dbcf Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Elham Rababh 5d05b09345 PAP-712 : fixes on Blood sugar 5 years ago
Sultan Khan c88bea4461 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 9acb5b087d bug fixes 5 years ago
Mirza.Shafique 090556f4d1 Merge branch 'mirza_home_page' into development_new_design_2.0 5 years ago
Mirza.Shafique 5dc88f51c3 Home Page 1.0 5 years ago
Sikander Saleem 8b2feb03ea last login and login options ui. 5 years ago