Commit Graph

1564 Commits (41f17047903c2b6f42cce7bef9fa5efbc87700d6)
 

Author SHA1 Message Date
Sultan khan 1f52794185 Merge branch 'sultan-patientapp' into 'development'
package name changed

See merge request Cloud_Solution/diplomatic-quarter!345
3 years ago
Sultan Khan 97d7f9225e package name changed 3 years ago
haroon amjad b5f180f16c Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!344
3 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
3 years ago
haroon amjad cf32d9f0ff Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 3 years ago
haroon amjad 90db04cee1 Jira Fixes 3 years ago
Sultan khan 69e957929d Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!343
3 years ago
Fatimah Alshammari b8ba80b361 Merge branch 'fatima-new' into development 3 years ago
Fatimah Alshammari 39ba2cfde7 fixed issues. 3 years ago
haroon amjad 5007064105 Jira fixes 3 years ago
hussam al-habibeh 02df6f4d85 PAP-664 3 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
3 years ago
hussam al-habibeh 352fd912de PAP-664 3 years ago
hussam al-habibeh 29249dc9a9 PAP-664 3 years ago
Sultan khan b2349394ff Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!342
3 years ago
Sultan Khan e1750ce24c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan e5fb16ad69 langauge issue 3 years ago
Sultan khan 08f7736030 Merge branch 'sultan-patientapp' into 'development'
Sultan patientapp

See merge request Cloud_Solution/diplomatic-quarter!341
3 years ago
Sultan Khan c9fe036b99 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan khan 1898c12ec3 Merge branch 'fix_merge_issues' into 'development'
fix translate issues

See merge request Cloud_Solution/diplomatic-quarter!340
3 years ago
Sultan Khan 7c398ba40d bug fix 3 years ago
hussam al-habibeh 146fc5d2b2 PAP-777 3 years ago
haroon amjad 037a887e5c Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development 3 years ago
hussam al-habibeh 6ea06ce442 PAP-729 3 years ago
Elham Rababh 8b8e239d3f fix button 3 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 3 years ago
Elham Rababh b01961e45f fix translate issues 3 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 3 years ago
Sultan Khan d6fd03b571 CONFIG 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 6534ca8349 Merge branches 'sultan-patientapp' and 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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
Sultan Khan ed20ba65b3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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
Sultan Khan 23ca95b9b6 bug fixes 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 a8413750c3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix-bugs 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 6442ce178d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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 8766a69928 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 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