Commit Graph

22 Commits (8c5746f7b19b4ecece4efede00a29665c9d7c701)

Author SHA1 Message Date
haroon amjad 65fbd7af8e referral finalised 5 years ago
Mohammad Aljammal 54d8965773 done child Vaccination 5 years ago
Mohammad Aljammal 0d098def04 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
 Conflicts:
	assets/app_icons/config.json
	assets/app_icons/fonts/DQIcons.ttf
	lib/config/config.dart
	lib/config/shared_pref_kay.dart
	lib/d_q_icons_icons.dart
	lib/locator.dart
	lib/pages/landing/home_page.dart
	lib/pages/landing/landing_page.dart
	lib/pages/rateAppointment/rate_appointment_doctor.dart
	lib/uitl/utils.dart
	lib/widgets/others/app_scaffold_widget.dart
5 years ago
haroon amjad b89c1f03b3 language translation fixes 5 years ago
mosazaid d1ac4080ca working on pharmacy home page 5 years ago
jammal 9328f942ba done ER service 5 years ago
Mohammad Aljammal 3ffff9686d Done allergies service 5 years ago
Mohammad Aljammal 82c2577d36 Done ask doctor service 5 years ago
Mohammad Aljammal c01e6095f2 done my trackers 5 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
6 years ago
Mohammad Aljammal 32e2732c43 feedback service 6 years ago
haroon amjad 750746aabe updates & fixes 6 years ago
Mohammad Aljammal d093ecd5e6 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
 Conflicts:
	ios/Podfile
	ios/Runner.xcodeproj/project.pbxproj
	lib/config/config.dart
	lib/uitl/translations_delegate_base.dart
6 years ago
Mohammad Aljammal a1fa2c0727 done vital sign 6 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
6 years ago
Mohammad Aljammal a84341af58 fix merge issues 6 years ago
Mohammad Aljammal 5ea0df9f1e Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
#	lib/uitl/date_uitl.dart
6 years ago
Sultan Khan e735855c33 registration done. 6 years ago
Mohammad Aljammal 940b327561 done Prescriptions 6 years ago
haroon amjad 049d455e3c Implementing appointment details functions 6 years ago
haroon amjad 9842c3a0b1 Translation updates 6 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 6 years ago