Commit Graph

91 Commits (fc2297394e6c8d3019c59e26563ed2cbbcdae266)

Author SHA1 Message Date
Mohammad ALjammal fc2297394e Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
	lib/presentation/doctor_app_icons.dart
	lib/screens/dashboard_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
6 years ago
Mohammad ALjammal c8a3beb530 fix issues in dev 6 years ago
Mohammad ALjammal 06f2aaef4b Merge branch 'ibrahim' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into dev-elham
 Conflicts:
	lib/client/base_app_client.dart
	lib/screens/auth/login_screen.dart
	lib/widgets/auth/login_form.dart
	lib/widgets/auth/verfiy_account.dart
6 years ago
Mohammad ALjammal 114edf8924 Merge remote-tracking branch 'origin/development' into development 6 years ago
Mohammad ALjammal 5294948a58 fix issues 6 years ago
ibrahim albitar e0c65222d2 enhancment insurance approvals 6 years ago
Elham b34aec65b8 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!107
6 years ago
Elham Rababah 395a7947c3 improve auth app 6 years ago
Salman Afzal 11f10f1eea Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
6 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 6 years ago
Elham Rababah be6c77f81b AD-113: Remove Remember Me 6 years ago
Salman Afzal a48ad33f36 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Salman Afzal a914ff9367 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	lib/config/config.dart
#	lib/presentation/doctor_app_icons.dart
6 years ago
Mohammad ALjammal c16c8897be Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/dashboard_screen.dart
6 years ago
Mohammad ALjammal 6d8289a0d4 change bottom bar navigation 6 years ago
Amjad Amireh cc2c0f9a1e Modify Patiant screen List style 6 years ago
Mohammad ALjammal 8157e1bc31 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 6 years ago
Salman Afzal 50e9dc0980 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	pubspec.yaml
6 years ago
Amjad Amireh 1935b781d6 Localization comment 6 years ago
Mohammad ALjammal afefa0a035 fix vital sign details 6 years ago
Mohammad ALjammal b3befa12db Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Salman Afzal ac612f0eda dashboard and patient app 6 years ago
Mohammad ALjammal 6a3e8baa86 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
Elham Rababah 489ad9e729 improve code and add AppExpandableNotifier 6 years ago
Amjad Amireh c792aa1fc7 Change design patiant profile 6 years ago
Salman Afzal bde30d93ec Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Salman Afzal 494a44148d patient profile 6 years ago
Elham Rababah 10877ac658 improve vital sign item details 6 years ago
unknown 40a0c1281a Merge branches 'develop' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 6 years ago
unknown 61674bec47 new pages 6 years ago
Mohammad ALjammal 14edbff8b4 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/patients/profile/vital_sign/body_measurements_screen.dart
6 years ago
Mohammad ALjammal 1f5bca3adc patient profile details 6 years ago
Elham Rababah 0d30fd6212 vitalsign details 6 years ago
Elham Rababah bd24b7c196 TimeSeriesChart as widget 6 years ago
Elham Rababah 6ebee5dbf6 first step form chart 6 years ago
Mohammad ALjammal 9ce7d3267b Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 6 years ago
Mohammad ALjammal 9572e16627 done My Referral Patient and create Base App Client 6 years ago
Amjad Amireh fff2b32dee ExpandableItem widget 6 years ago
Mohammad ALjammal 7d3bfddd68 update design my schedule and doctor replay 6 years ago
amjad nabil amireh 72cea26787 Merge branch 'Amjad_search' into 'master'
New Design from Mahmoud

See merge request Cloud_Solution/doctor_app_flutter!69
6 years ago
Amjad Amireh bb606e6a1d New Design from Mahmoud 6 years ago
Mahmoud Shrouf 394bd514ab My Changes Before Demo 6 years ago
her_username 111d90d56f Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/models/patient/patiant_info_model.dart
	pubspec.lock
6 years ago
her_username 7d3856f2b2 done QR reader 6 years ago
Elham Rababah 1e656af143 handelCatcherrorCase 6 years ago
her_username b07ff8154c update local for doctor replay , my schedule and message screen 6 years ago
Elham Rababah cabbf03eec vital_sign_details 6 years ago
ibrahim albitar 211a40c706 Merge branch 'develop' into 'master'
Develop

See merge request Cloud_Solution/doctor_app_flutter!50
6 years ago
unknown 80b6716091 call phramicies 6 years ago
Elham Rababah 7a370c29dc use ProfileImageWidget in patient profile 6 years ago