Commit Graph

115 Commits (283473a06a0eb8aedff4d62eccbdf4074800a8e3)

Author SHA1 Message Date
Amjad amireh c2cfea7360 Contact us 5 years ago
Amjad amireh c2b7507005 Contact us 5 years ago
haroon amjad 478917b240 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
Mohammad Aljammal 4ac77593ad add payment service page and translations 5 years ago
haroon amjad 38c980be81 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 5400d534db updates for push notifications 5 years ago
Sultan Khan 0a2cb22042 design issues fixed 5 years ago
Mohammad Aljammal 8e96c79d05 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/config/localized_values.dart
5 years ago
Mohammad Aljammal 9159928e27 edit on vaccine service 5 years ago
Mohammad Aljammal b0f0b87345 fix merge issues 5 years ago
Mohammad Aljammal 68466c8d03 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/localized_values.dart
	lib/core/service/client/base_app_client.dart
	lib/models/Appointments/DoctorListResponse.dart
	lib/pages/BookAppointment/widgets/DoctorView.dart
	lib/pages/MyAppointments/MyAppointments.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
5 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 5 years ago
Mohammad Aljammal 02ce04a397 medical_profile_page.dart 5 years ago
Mohammad Aljammal 1b3a780a29 add ar lan for medical profile 5 years ago
Mohammad Aljammal 4ffbb80f3d ER 5 years ago
Mohammad Aljammal ef4a57223c fix DoctorView.dart UI issues 5 years ago
haroon amjad 13adb46319 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/config/shared_pref_kay.dart
5 years ago
Mohammad Aljammal 91e5a20fd0 fix merge issues 5 years ago
Mohammad Aljammal 54b766de81 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/config/shared_pref_kay.dart
	lib/uitl/translations_delegate_base.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
Mohammad Aljammal d16ea676cf done parking service ,fix design issues in home page and add new icon 5 years ago
Mohammad Aljammal 01a011a03d done dashboard page 5 years ago
haroon amjad 96b7d00b4b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon 5 years ago
haroon amjad 30e08b4417 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	lib/pages/login/login.dart
5 years ago
haroon amjad 7a8392a97e updates 5 years ago
Mohammad Aljammal 895c09efa4 parking service 5 years ago
Sultan Khan 8516f7de1b Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Mohammad Aljammal 4adc2916b4 fix merge issues 5 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
5 years ago
Mohammad Aljammal 8989fbc9b7 done design dashboard 5 years ago
haroon amjad 61dba06236 Twilio implemented in LiveCare 5 years ago
haroon amjad cc4f5c0615 updates 5 years ago
haroon amjad 5f1413a2ac implementing Twilio in LiveCare 5 years ago
haroon amjad db30fbdfd2 implementing livecare 6 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 913729fc58 speech search 6 years ago
Sultan Khan 3b2f9251dc search 6 years ago
haroon amjad 7972d01dff Insurance Approval implemented 6 years ago
Mohammad Aljammal 125360ced7 fix merge issues 6 years ago
Mohammad Aljammal 002efe3b45 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
6 years ago
Mohammad Aljammal cfd5b2ccff feedback Service done 6 years ago
Sultan Khan 8e3fb6831d registration changes 6 years ago
Sultan Khan 9d0a2e1e43 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 41b438fd74 login page changes 6 years ago
Mohammad Aljammal ec09721869 fix merge issues 6 years ago
Mohammad Aljammal 5874f4ba21 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
6 years ago
Mohammad Aljammal 1ac420ef7c Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/uitl/translations_delegate_base.dart
6 years ago
Sultan Khan 3a15c16883 login changes 6 years ago
Mohammad Aljammal 43349542da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile 6 years ago
Mohammad Aljammal 8de50bfe74 medical - my doctor and prescription services and pages 6 years ago
hussam al-habibeh e92cb2e1ac Design and return Pharmacy List 6 years ago
Sultan Khan 31fe444150 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 6 years ago
Sultan Khan 76aeeffad7 login page changes 6 years ago
Mohammad Aljammal 93bfcbc20f Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
 Conflicts:
	lib/pages/landing/landing_page.dart
	pubspec.yaml
6 years ago
Mohammad Aljammal e147787be9 merge search and return medicine 6 years ago
Mohammad Aljammal 01b230accf Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into SearchMedicineAndReturnMedicineList
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/main.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
	pubspec.yaml
6 years ago
Mohammad Aljammal 4bc68c6afd merge sultan 6 years ago
Mohammad Aljammal 2d5b725818 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_merge
 Conflicts:
	lib/config/config.dart
	lib/config/localized_values.dart
	lib/pages/landing/landing_page.dart
	lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal b2875fbce3 merge haroun 6 years ago
hussam al-habibeh 31d2816e64 design for search medicine and return medicine list 6 years ago
Mohammad Aljammal 3a68e0e092 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_haron
 Conflicts:
	lib/config/config.dart
	lib/widgets/others/app_scaffold_widget.dart
6 years ago
Sultan Khan 5a08cb720c login changes 6 years ago
Mohammad Aljammal fc749de77e create doctor card and medical page 6 years ago
Sultan Khan f8d8e1c685 new pages added 6 years ago
Sultan Khan 192b21a7e7 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
# Conflicts:
#	lib/main.dart
#	lib/widgets/input/date_picker/button_actions.dart
#	lib/widgets/input/text_field.dart
#	lib/widgets/others/app_scaffold_widget.dart
6 years ago
Mohammad Aljammal 257cc92691 add MVVM and di Mohammad Aljammal and Elham Rababah 6 years ago