Commit Graph

323 Commits (a2e60e7584d5058f00367eb8659f51a750727e26)

Author SHA1 Message Date
mosazaid a2e60e7584 fix bugs pharmacy 4 years ago
Sultan Khan 9e31a3c560 bug fixes 4 years ago
Sultan Khan 57d87dfc03 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 11ffed2ae3 bug fixes 4 years ago
Fatimah Alshammari 787b55a803 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fatima-new
# Conflicts:
#	lib/pages/medical/my_trackers/blood_pressure/AddBloodPressurePage.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal d9fabbab17 Fix feedback 4 years ago
Fatimah Alshammari 74d0826342 fixed issues 4 years ago
hussam al-habibeh 0a3c44b5e8 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medication_availability
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 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
4 years ago
hussam al-habibeh d3868844de Medication availability 4 years ago
Zohaib Iqbal Kambrani bf303a7be0 RRT Implementation 4 years ago
Zohaib Iqbal Kambrani e4256d6874 RRT in progress (Service implementations) 5 years ago
Sultan Khan d88e3faa6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Zohaib Iqbal Kambrani 4da163d186 RRT in progress in stage 5 years ago
Sultan Khan 23ca95b9b6 bug fixes 5 years ago
Zohaib Iqbal Kambrani 4abdd9bde7 no message 5 years ago
Elham Rababh 86414b46fd PAP-304 : show CBC details 5 years ago
Sultan Khan 14ef096c32 changes and fixes 5 years ago
Sultan khan 15f620d720 Merge branch 'Jul_fixes' into 'development'
Jul fixes

See merge request Cloud_Solution/diplomatic-quarter!322
5 years ago
hussam al-habibeh fefde8f575 jira bugs 5 years ago
Sultan khan 924f9bedc0 Merge branch 'bug_fixing' into 'development'
Bug fixing

See merge request Cloud_Solution/diplomatic-quarter!319
5 years ago
Sultan khan 10f8ee5e81 Merge branch 'bug_fix_mirza' into 'development'
Bug Fix: 873, 878 to 881

See merge request Cloud_Solution/diplomatic-quarter!320
5 years ago
Mirza.Shafique 58d5734f1a Bug Fix: 873, 878 to 881 5 years ago
Sikander Saleem 38f134b6ff Bug PAP-884 fixed, email was not updating. 5 years ago
hussam al-habibeh 446021eb90 adding doctor list to health calculator 5 years ago
hussam al-habibeh 854352d9ce jira bugs 5 years ago
Sikander Saleem b2e9060c3f Bug PAP-877 fixed, blood tracker exception. 5 years ago
Elham Rababh 2e1c9780d7 PAP-610: prevent show send email button if user have no vaccine 5 years ago
Sikander Saleem b7fbee3252 improvements 5 years ago
Sikander Saleem e41040b1b9 PAP-675 fixed, H2O Week chart vales from -1 to 1. 5 years ago
Mohammad Aljammal 1607aecb4a Merge branch 'pharmacy-Fatima' into 'development'
fixed an issue in recommended page

See merge request Cloud_Solution/diplomatic-quarter!304
5 years ago
Fatimah Alshammari 265d13b970 fixed an issue in recommended page 5 years ago
Mohammad Aljammal e04421079e Merge branch 'fix_bugs_Mar' into 'development'
Fix bugs mar

See merge request Cloud_Solution/diplomatic-quarter!301
5 years ago
Elham Rababah 5dd2e9986e PAP-559: fix hospital_service 5 years ago
Fatimah Alshammari 71a393df68 fixed categories issue 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 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
Zohaib Iqbal Kambrani 6f2c947687 Packages And offers.. 5 years ago
haroon amjad 454957ebba Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
5 years ago
Sultan Khan 616212828d Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan 66acce3b40 ancillary order pages added 5 years ago
haroon amjad db0fcd51cc pharmacy updates 5 years ago
Zohaib Iqbal Kambrani f410ce20ca Packages and Offers in Progress 5 years ago
mosazaid ed1626f8ee Merge branch 'development' into fix_order_checkout_payment 5 years ago
mosazaid 74dd274502 working on pharmacy some fixes on cart page and request body 5 years ago
Mohammad Aljammal 4dcb70d7eb Merge branch 'pharmacy-bugs' into 'development'
Pharmacy bugs

See merge request Cloud_Solution/diplomatic-quarter!282
5 years ago
hussam al-habibeh a534b1415e products filtering fix 5 years ago
Mohammad Aljammal 861dba9a94 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ed_online
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljammal ec401d4848 Done Ed online 5 years ago