Commit Graph

13 Commits (9f06ce7d1db9b9bc8d25874abd23677a3c8d0a85)

Author SHA1 Message Date
Mohammad Aljammal ea02622977 fix merge issues 5 years ago
Sultan Khan 5d112b5464 merge 5 years ago
Sultan Khan 47c42808fd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 4c1a8dc38f new changes 5 years ago
haroon amjad 750746aabe updates & fixes 6 years ago
Mohammad Aljammal 22de043892 fix merge issues 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 4d28209b07 add permission android 6 years ago
haroon amjad b3e5047820 Payment method selection page created, Appointment details functions implemented 6 years ago
Sultan Khan 76aeeffad7 login page changes 6 years ago
Sultan Khan 5a08cb720c login changes 6 years ago
Sultan Khan f8d8e1c685 new pages added 6 years ago
Mohammad Aljammal 3ed5c3878f init project structure By Mohammad and Elham 6 years ago