Commit Graph

38 Commits (6caf7290beffaa26fd2350ddcb2c270c699238d9)

Author SHA1 Message Date
Amjad amireh c0c175651f edit card_position.dart 4 years ago
Mohammad Aljammal fbb4b326a8 Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
 Conflicts:
	lib/locator.dart
	pubspec.yaml
4 years ago
Mohammad Aljammal 153335538a done monthly reports 4 years ago
Mohammad Aljammal 5485cbab36 ER 4 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
4 years ago
Mohammad Aljammal fe66ee5993 fix lab result issues 4 years ago
Mohammad Aljammal d52e612bff Merge branch 'insurance' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
 Conflicts:
	lib/config/config.dart
	lib/locator.dart
	lib/pages/medical/medical_profile_page.dart
	pubspec.yaml
4 years ago
hussam al-habibeh 3a79ddb488 vaccine service 4 years ago
haroon amjad 6ea1ed3eaa added geolocation dependency in pubspec 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
haroon amjad 5f1413a2ac implementing Twilio in LiveCare 4 years ago
haroon amjad db30fbdfd2 implementing livecare 4 years ago
Sultan Khan 4c1a8dc38f new changes 4 years ago
Mohammad Aljammal f229958e1c add ions 4 years ago
haroon amjad 7d0efda1c4 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/localized_values.dart
#	lib/core/service/client/base_app_client.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/confirm-login.dart
#	lib/pages/medical/medical_profile_page.dart
#	lib/services/authentication/auth_provider.dart
#	lib/uitl/translations_delegate_base.dart
#	pubspec.yaml
4 years ago
Sultan Khan e735855c33 registration done. 4 years ago
haroon amjad 28fde5c500 My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates 4 years ago
haroon amjad 192a3835d6 implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment. 4 years ago
haroon amjad b3e5047820 Payment method selection page created, Appointment details functions implemented 4 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
4 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
4 years ago
Mohammad Aljammal 43349542da Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile 4 years ago
hussam al-habibeh e92cb2e1ac Design and return Pharmacy List 4 years ago
Sultan Khan 31fe444150 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 76aeeffad7 login page changes 4 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
4 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
4 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
4 years ago
hussam al-habibeh 31d2816e64 design for search medicine and return medicine list 4 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
4 years ago
Mohammad Aljammal fc749de77e create doctor card and medical page 4 years ago
Sultan Khan f8d8e1c685 new pages added 4 years ago
Mohammad Aljammal 257cc92691 add MVVM and di Mohammad Aljammal and Elham Rababah 4 years ago
haroon amjad 1554a6bdf5 Book Appointment Flow added 4 years ago
Mohammad Aljammal 19676549e1 add base client, landing page, bottom_nav_bar , List Container, List Item, drawer progress indicator and asset file 4 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 4 years ago