Commit Graph

1440 Commits (a67e320a8e9b988b1d2cf4bd3a6370e0a54ee88a)
 

Author SHA1 Message Date
enadhilal 292e983614 fixing issues 4 years ago
enadhilal de4af313fa Merge branch 'development' into enad_pharmacy2 4 years ago
enadhilal 57e9599f78 Merge branch 'development' into enad_pharmacy2 4 years ago
haroon amjad f72c860516 Merge branch 'development' into Haroon 4 years ago
haroon amjad 60ea0465fd fixes & updates 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
haroon amjad 13f6015cf0 Merge branch 'development' into Haroon 4 years ago
haroon amjad 69649ff7f8 added verified icon in homepage when patient is logged in 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
Mohammad Aljammal ddea17a87c Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!263
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
Fatimah Alshammari ef8312f2b8 Merge branch 'development' into pharmacy-Fatima
# Conflicts:
#	lib/core/service/parmacyModule/parmacy_module_service.dart
#	lib/core/service/parmacyModule/prescription_service.dart
#	lib/pages/pharmacies/product_detail.dart
4 years ago
Fatimah Alshammari ce64da11e4 homepage and product details design 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
Sultan Khan eeb073fb17 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 ca82024f9e Merge branch 'fix_pharmacy' into 'development'
Fix pharmacy

See merge request Cloud_Solution/diplomatic-quarter!258
4 years ago
Mohammad Aljammal bb42647c91 Merge branch 'development' into 'fix_pharmacy'
# Conflicts:
#   lib/pages/login/login.dart
4 years ago
Mohammad Aljammal f1f28f5ed0 Merge branch 'fix_login_design' into 'development'
fix colors issues

See merge request Cloud_Solution/diplomatic-quarter!257
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 9ed8f2365d fix barcode issues 4 years ago
Mohammad Aljammal 8eda45d637 Merge branch 'my_tracker' into 'development'
fix bottom nav bar

See merge request Cloud_Solution/diplomatic-quarter!255
4 years ago
Mohammad Aljammal 3e441c55b2 fix bottom nav bar 4 years ago
Mohammad Aljammal 76b2342ad8 Merge branch 'my_tracker' into 'development'
My tracker

See merge request Cloud_Solution/diplomatic-quarter!254
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
Mohammad Aljammal f0ee9db952 Merge branch 'Haroon' into 'development'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!253
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