Commit Graph

820 Commits (d8996cf87905a7ba9e1595b3ebcced38b6c9372e)
 

Author SHA1 Message Date
Sultan Khan 130fb53a65 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 3247378c02 search 4 years ago
haroon amjad 30e08b4417 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/pages/login/login.dart
4 years ago
haroon amjad 7a8392a97e updates 4 years ago
Mohammad Aljammal 1954346017 Merge branch 'amjad_amireh' into 'master'
Amjad amireh

See merge request Cloud_Solution/diplomatic-quarter!32
4 years ago
Mohammad Aljammal c0c6376f55 filter doctor by department 4 years ago
Mohammad Aljammal dc9b9e21ad filter doctor by department 4 years ago
Mohammad Aljammal 895c09efa4 parking service 4 years ago
Sultan Khan 1974e51602 merge 4 years ago
Sultan Khan 5d112b5464 merge 4 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 9b55309d53 text to speech 4 years ago
Mohammad Aljammal 418ffb19a2 Merge branch 'dashboard' into 'master'
Dashboard

See merge request Cloud_Solution/diplomatic-quarter!30
4 years ago
Mohammad Aljammal 4adc2916b4 fix merge issues 4 years ago
Mohammad Aljammal 30c0963063 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 8989fbc9b7 done design dashboard 4 years ago
Mohammad Aljammal 0709c99e20 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!29
4 years ago
haroon amjad 61dba06236 Twilio implemented in LiveCare 4 years ago
Sultan Khan 2f9885ecf8 family file changes 4 years ago
Sultan Khan 8887ba85fe family file 4 years ago
haroon amjad 732ab90b2f Book Appointment check login 4 years ago
Sultan Khan cb99b2a7a7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 327c4585a6 family file change 4 years ago
haroon amjad 760db6a873 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/locator.dart
4 years ago
haroon amjad cc4f5c0615 updates 4 years ago
haroon amjad 5f1413a2ac implementing Twilio in LiveCare 4 years ago
Mohammad Aljammal 9cf5c80aae add time line and appointment rate 4 years ago
Mohammad Aljammal f5b16734c6 add time line 4 years ago
Mohammad Aljammal a826fcb0fe Merge branch 'medical_report' into 'master'
Medical report

See merge request Cloud_Solution/diplomatic-quarter!28
4 years ago
Mohammad Aljammal f6d30178bf done medical report 4 years ago
Mohammad Aljammal b6319c558c Merge branch 'report_service' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
4 years ago
Mohammad Aljammal aa60a93a25 Merge branch 'vital_sign' into 'master'
Vital sign

See merge request Cloud_Solution/diplomatic-quarter!27
4 years ago
Mohammad Aljammal 41c5263012 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign 4 years ago
Mohammad Aljammal 75fdf28036 fix lab Result 4 years ago
Mohammad Aljammal 8495260c5a fix issues in feedback 4 years ago
haroon amjad db30fbdfd2 implementing livecare 4 years ago
haroon amjad 59c279998c working on vital signs integration 4 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 913729fc58 speech search 4 years ago
Mohammad Aljammal 09561ac248 Merge branch 'vital_sign' into 'master'
Vital sign

See merge request Cloud_Solution/diplomatic-quarter!26
4 years ago
Mohammad Aljammal 5619b8c06f fix issues in feedback 4 years ago
Mohammad Aljammal 2b0e35a907 fix issues in base app client 4 years ago
Mohammad Aljammal d4c9352fd9 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!25
4 years ago
haroon amjad 73cf37a3a5 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/core/service/client/base_app_client.dart
4 years ago
haroon amjad b9d913e6a5 Merge fixes & updates 4 years ago
Sultan Khan 03b34115c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 3b2f9251dc search 4 years ago
Mohammad Aljammal 915de5a871 Merge branch 'vital_sign' into 'master'
Vital sign

See merge request Cloud_Solution/diplomatic-quarter!22
4 years ago
Mohammad Aljammal a5e63817f2 done vital sign 4 years ago
Sultan Khan 4c1a8dc38f new changes 4 years ago