Commit Graph

829 Commits (3e947dda377b1f5318f1818f1cf2c7ac57466693)

Author SHA1 Message Date
Sultan Khan 144ef52c70 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan b3e6c4efda voice command changes 4 years ago
Mohammad Aljammal 0098345d05 add Prescription Delivery Address Page amd fix the Authentication Pharmacy 4 years ago
Mohammad Aljammal 87ad027d33 Merge branch 'improve_hhc' into 'development'
Improve hhc

See merge request Cloud_Solution/diplomatic-quarter!264
4 years ago
Mohammad Aljammal 29f4e6acb6 Merge branch 'hmg-services-fixing' into 'development'
Hmg services fixing

See merge request Cloud_Solution/diplomatic-quarter!262
4 years ago
haroon amjad 9ecf745747 fixes 4 years ago
haroon amjad b6c617888b Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
4 years ago
mosazaid cbe422cbc6 Merge branch 'hmg-services-fixing' into development
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
mosazaid 0444b21101 Merge branch 'development' into hmg-services-fixing
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Elham Rababah 94ee969406 hhc msg translation 4 years ago
Elham Rababah 8a1924cca2 fix images in hhc 4 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 9fca52efca voice command 4 years ago
Mohammad Aljammal e964afd4f2 Merge branch 'fix_security_issue' into 'development'
fix security issues in pharmacy

See merge request Cloud_Solution/diplomatic-quarter!261
4 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 4 years ago
Mohammad Aljammal 63657cb7c4 Merge branch 'h2o_improvement' into 'development'
H2O feature, setting page added

See merge request Cloud_Solution/diplomatic-quarter!260
4 years ago
Sikander Saleem e40ad85d61 H2O feature, setting page added 4 years ago
Mohammad Aljammal 1d724a8db6 Merge branch 'h2o_improvement' into 'development'
H2o improvement

See merge request Cloud_Solution/diplomatic-quarter!259
4 years ago
Sikander Saleem bd062150c1 H2O feature improvement 4 years ago
Sikander Saleem aef4c7bfac H2O feature improvement 4 years ago
haroon amjad 0b83089b86 Merge branch 'development' into Haroon 4 years ago
haroon amjad 3832cee1ad Translation fixes 4 years ago
Sikander Saleem 3b4e791017 H2O feature improvement 4 years ago
Mohammad Aljammal bb42647c91 Merge branch 'development' into 'fix_pharmacy'
# Conflicts:
#   lib/pages/login/login.dart
4 years ago
Mohammad Aljammal ab53ca82b1 fix colors issues 4 years ago
mosazaid 822defbd04 working on bmi calculator design and functionality 4 years ago
haroon amjad 3bad0a3804 Merge branch 'development' into Haroon 4 years ago
haroon amjad 146019432a LiveCare schedule implemented 4 years ago
Sikander Saleem 8f37fbf260 Qr icon added, notify me api added & improvements 4 years ago
Sultan Khan 3ac69692be Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
Sultan Khan 0213264b7f bug fixes 4 years ago
Mohammad Aljammal 3e441c55b2 fix bottom nav bar 4 years ago
Mohammad Aljammal 9d8c1ddf63 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
 Conflicts:
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 484cca086e fix my my Trackers 4 years ago
haroon amjad ab158e14e9 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 7c538b350f LiveCare Scheduling finalized, Appointments in ToDo list categorized 4 years ago
hussam al-habibeh 97919c217f Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into health-converter
 Conflicts:
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
hussam al-habibeh 1ce0ef7b6c health-converter fix 4 years ago
haroon amjad dde10cd27b working in LiveCare Scheduling 4 years ago
Mohammad Aljammal db2376f50c fix blood and weight on my trackers 4 years ago
Sultan Khan ccd2fc5068 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 4 years ago
haroon amjad 6945230965 Merge branch 'development' into Haroon
# Conflicts:
#	lib/config/config.dart
#	lib/config/localized_values.dart
#	lib/pages/Covid-DriveThru/covid-drivethru-location.dart
#	lib/pages/landing/home_page.dart
#	lib/pages/medical/smart_watch_health_data/health_data_list.dart
#	lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
mosazaid 38d52b52c8 Merge branch 'development' into fix_design
# Conflicts:
#	lib/config/localized_values.dart
#	lib/locator.dart
4 years ago
Sultan Khan 68f7a9ff9c login chnages 4 years ago
mosazaid 174534d8a5 fix Blood donation functionality and design 4 years ago
Mohammad Aljammal 405f67be1e Merge branch 'pharmacy-Fatima' into 'development'
Pharmacy fatima

See merge request Cloud_Solution/diplomatic-quarter!249
4 years ago
Fatimah Alshammari 7a516cae51 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy/order/Order.dart
#	lib/pages/pharmacy/order/OrderDetails.dart
4 years ago
Mohammad Aljammal f883e1bd78 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_tracker
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Mohammad Aljammal 0b1014a91c fix blood sugar service on my tracker 4 years ago
Fatimah Alshammari 0f22a50a5d Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/pages/pharmacy/profile/profile.dart
4 years ago