Commit Graph

379 Commits (5669021add7cf8a1daaa2d277be055957a43a474)

Author SHA1 Message Date
Elham Rababah 0d8455faa7 Finish medicine search design 4 years ago
Elham Rababah 871bd6ab20 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into medicine_desgin
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
	lib/widgets/shared/app_text_form_field.dart
4 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 4 years ago
Mohammad Aljammal 2e4f9fa335 Merge remote-tracking branch 'origin/development' into development 4 years ago
Mohammad Aljammal 5eae2f9519 fix merge issues 4 years ago
Mohammad Aljammal 146a53a6e5 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
	lib/models/pharmacies/pharmacies_List_request_model.dart
	lib/screens/medicine/medicine_search_screen.dart
4 years ago
Elham Rababah e37a3e8ce1 Finish dashboard screen design 4 years ago
Sultan Khan 6eb2da3770 voice search 4 years ago
hussam al-habibeh b6d2cdb1db fixing clinic name in app reopening 4 years ago
hussam al-habibeh 0444d6803c verification Screen Fixed 4 years ago
hussam al-habibeh d3bb85129c LogIn function refactoring 4 years ago
hussam al-habibeh 629ccbeda8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
 Conflicts:
	lib/screens/dashboard_screen.dart
4 years ago
hussam al-habibeh d866d8b9de get clinic list 4 years ago
ibrahim albitar 98950890a0 Add User Guid Module 4 years ago
hussam al-habibeh 0e471aaa63 language setup on logout 4 years ago
hussam al-habibeh 420cc0622c Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 4 years ago
hussam al-habibeh 5172703a32 setup language on logout 4 years ago
ibrahim albitar c07f84ff78 fixing and enhancments 4 years ago
Elham c35c6f7444 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!134
4 years ago
hussam al-habibeh 91ffdabd73 Translation stage five 4 years ago
Elham Rababah c62340e834 modify IMEI 4 years ago
hussam al-habibeh fb6d54faaf Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam
 Conflicts:
	lib/screens/dashboard_screen.dart
4 years ago
hussam al-habibeh 054933b280 Translation stage four 4 years ago
Elham Rababah bd3ce0a4d4 refactor models 4 years ago
erababah cad096d8c7 fix issue on ios and improve structure by Elham & mohammad 4 years ago
hussam al-habibeh 8f04edb450 Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/landing_page.dart
4 years ago
Mohammad Aljammal 5062d942c3 Merge branch 'mohammad' into 'development'
Mohammad

See merge request Cloud_Solution/doctor_app_flutter!126
4 years ago
hussam al-habibeh c486d7f357 translation stage three 4 years ago
Mohammad ALjammal 63dd8262da Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/dashboard_screen.dart
	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
Mohammad ALjammal f22eec909b create internet connection page Mohammad & Elham 4 years ago
Sultan Khan b26e750abb drawer design updated 4 years ago
Mohammad Aljammal 934236ac82 Merge branch 'mohammad' into 'development'
fix issues in login

See merge request Cloud_Solution/doctor_app_flutter!123
4 years ago
Mohammad ALjammal 6747495ea8 fix issues in login 4 years ago
hussam al-habibeh b63d8906bc Merge branch 'hussam' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/profile_screen.dart
4 years ago
Sultan Khan 79c2de3f96 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	fonts/DoctorApp.ttf
#	lib/presentation/doctor_app_icons.dart
4 years ago
hussam alhababieh a02fe9c83d translation stage two 4 years ago
Elham Rababah 574a951fcf finish clinic exept design 4 years ago
hussam alhababieh b0005e72f9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 4 years ago
hussam alhababieh b4570d7bd1 translation for pages stage one 4 years ago
Elham Rababah 165d697e33 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Elham Rababah ef8dfc5b5f first step form change clinic 4 years ago
Mohammad Aljammal 7be7d715fe Merge branch 'mohammad' into 'development'
Mohammad

See merge request Cloud_Solution/doctor_app_flutter!117
4 years ago
Mohammad ALjammal 94dbecca4a fix issues in login 4 years ago
ibrahim albitar 09ca836ea7 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
ibrahim albitar 6fd43a281d fixing 4 years ago
Mohammad ALjammal 0dad77bfa2 fix issues in login 4 years ago
Mohammad ALjammal 69173e8c46 fix issues in login focus 4 years ago
amjad nabil amireh 67c0531fe1 Merge branch 'Amjad_search' into 'development'
Modify date in time in search patient

See merge request Cloud_Solution/doctor_app_flutter!116
4 years ago
Amjad Amireh 66627534a9 Modify date in time in search patiant 4 years ago
Mohammad ALjammal d52429564d fix issues in Patient 4 years ago
Mohammad ALjammal b758ae8196 fix issues 4 years ago
Mohammad ALjammal fa9e1a344a fix issues 4 years ago
Mohammad ALjammal c7f1c6d174 Merge branch 'ibrahim-merge' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/client/base_app_client.dart
	lib/config/config.dart
	lib/screens/auth/login_screen.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/widgets/auth/verfiy_account.dart
4 years ago
Mohammad ALjammal a3730e4efb fix issues with sultan branch 4 years ago
Mohammad ALjammal 79eb6b19d0 Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 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
4 years ago
Mohammad ALjammal edd25ff437 Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad ALjammal 2877aa171e Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge
 Conflicts:
	lib/widgets/auth/verfiy_account.dart
4 years ago
Mohammad ALjammal 692674fac0 merge ibrahim 4 years ago
Mohammad ALjammal 80664439d9 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into ibrahim-merge 4 years ago
Mohammad ALjammal 2b1391a6bb Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development 4 years ago
Mohammad ALjammal ed857d8d54 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/client/base_app_client.dart
	lib/screens/dashboard_screen.dart
4 years ago
Mohammad ALjammal e545d4992c fix issues in dev 4 years ago
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
4 years ago
Mohammad ALjammal c8a3beb530 fix issues in dev 4 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
4 years ago
Mohammad ALjammal 114edf8924 Merge remote-tracking branch 'origin/development' into development 4 years ago
Mohammad ALjammal 5294948a58 fix issues 4 years ago
ibrahim albitar e0c65222d2 enhancment insurance approvals 4 years ago
Amjad Amireh 68031519e2 Merge branch 'Amjad_search' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/config/config.dart
4 years ago
Elham Rababah 3d8f8680b3 DA-115:add Authentication Type to verfiy account screen 4 years ago
Amjad Amireh e0b841a4c1 change font size 4 years ago
Elham b34aec65b8 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!107
4 years ago
Elham 25d42c4a26 Revert "Merge branch 'elham' into 'master'"
This reverts merge request !105
4 years ago
Elham 73fd8932d4 Merge branch 'elham' into 'master'
Elham

See merge request Cloud_Solution/doctor_app_flutter!105
4 years ago
Elham Rababah 395a7947c3 improve auth app 4 years ago
Amjad Amireh 3410d691f8 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search
 Conflicts:
	lib/config/config.dart
4 years ago
Mohammad ALjammal 513fcd24b1 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	lib/config/config.dart
4 years ago
Mohammad ALjammal 9b065036ae fix issues in get patients service 4 years ago
ibrahim albitar 4638ba56a2 jira fixes 4 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
4 years ago
Amjad Amireh f3c20d9866 Modify Patiant screen List style 4 years ago
Elham Rababah be6c77f81b AD-113: Remove Remember Me 4 years ago
Elham Rababah e6b99adc80 change calling serivce to base app client 4 years ago
Elham Rababah d4ba01de5b Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Elham Rababah a42f06c9ff modify hospital provider to make it call app base 4 years ago
Mohammad ALjammal 4a8b97b189 Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/providers/patients_provider.dart
	lib/routes.dart
4 years ago
ibrahim albitar d3818bd3b3 fix 4 years ago
Mohammad ALjammal c1b21dc1c3 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Elham Rababah 57cba4e786 fix verfiy account 4 years ago
Mohammad ALjammal 76f8eba86e create Prescription In and Out Patient 4 years ago
Salman Afzal a48ad33f36 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 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
4 years ago
Elham Rababah 610ae3c1fb add in patient prescription details screen 4 years ago
Mohammad ALjammal 3495e6bc9b Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Mohammad ALjammal 2ad96dad88 create Prescription In and Out Patient 4 years ago
Elham Rababah 5ff65fc1a1 improve login form 4 years ago
Mohammad ALjammal 33b59514a0 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 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
4 years ago
Elham Rababah 6e5c2aca4d Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Elham Rababah 1e507cca3e finish resend code 4 years ago
Mohammad ALjammal 6d8289a0d4 change bottom bar navigation 4 years ago
Amjad Amireh cc2c0f9a1e Modify Patiant screen List style 4 years ago
Mohammad ALjammal 05525fd87c fix issues in My Referred Patient widget 4 years ago
Mohammad ALjammal c8b2604110 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/widgets/doctor/my_referred_patient_widget.dart
4 years ago
Mohammad ALjammal 8157e1bc31 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 4 years ago
Elham Rababah 40eb7f8064 improve vital sgin and return the correct color to login header 4 years ago
Salman Afzal 5f6e9104d0 scroll change 4 years ago
Salman Afzal 50e9dc0980 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan
# Conflicts:
#	pubspec.yaml
4 years ago
Mohammad ALjammal c7ad16cbcd update design Radiology Screen and create Radiology Report Screen 4 years ago
Amjad Amireh 1935b781d6 Localization comment 4 years ago
Salman Afzal 4239124f1a dashboard icon updated 4 years ago
Elham Rababah dc73f7bfd8 Merge branch 'mohammad' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 4 years ago
Mohammad ALjammal afefa0a035 fix vital sign details 4 years ago
Elham Rababah fe66dfe571 fix table cell 4 years ago
Mohammad ALjammal b3befa12db Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Salman Afzal ac612f0eda dashboard and patient app 4 years ago
Mohammad ALjammal ec85a0ea18 change design VitalSignDetailsWidget 4 years ago
Mohammad ALjammal 6a3e8baa86 Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Mohammad ALjammal 9b5658c00e change design My Referral and My Referral Patient 4 years ago
Elham Rababah 489ad9e729 improve code and add AppExpandableNotifier 4 years ago
Amjad Amireh c792aa1fc7 Change design patiant profile 4 years ago
Salman Afzal bde30d93ec Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Salman Afzal 494a44148d patient profile 4 years ago
Elham Rababah 10877ac658 improve vital sign item details 4 years ago
unknown 40a0c1281a Merge branches 'develop' and 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into develop 4 years ago
unknown 61674bec47 new pages 4 years ago
Mohammad ALjammal 4f0059d092 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/screens/doctor/my_referred_patient_screen.dart
4 years ago
Mohammad ALjammal 540d902236 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	lib/providers/patients_provider.dart
4 years ago
Amjad Amireh b8e5ab9a46 design 4 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
4 years ago
Mohammad ALjammal 1f5bca3adc patient profile details 4 years ago
Elham Rababah 0d30fd6212 vitalsign details 4 years ago
Amjad Amireh 69a618018d MyPrefered Patiant 4 years ago
Amjad Amireh 3c3d85c255 My Referred Patient 4 years ago
Elham Rababah bd24b7c196 TimeSeriesChart as widget 4 years ago
Mohammad ALjammal bf094136ab create vital sign details 4 years ago
Mohammad ALjammal ef48a995eb Merge branch 'elham' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Mohammad ALjammal 33fe5e8263 create vital sign details 4 years ago
Elham Rababah 6ebee5dbf6 first step form chart 4 years ago
Mohammad ALjammal 2349a596ea Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad
 Conflicts:
	pubspec.lock
	pubspec.yaml
4 years ago
Elham f9e2fd58ab Merge branch 'elham' into 'master'
add login logic with silent options

See merge request Cloud_Solution/doctor_app_flutter!75
4 years ago
Mohammad ALjammal 082447c576 done My Referral Patient and create Base App Client 4 years ago
Elham Rababah c5bbb0495a add login logic with silent options 4 years ago
Mohammad ALjammal 9ce7d3267b Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into mohammad 4 years ago
Mohammad ALjammal 9572e16627 done My Referral Patient and create Base App Client 4 years ago
Amjad Amireh 903eaba132 deete 4 years ago
Amjad Amireh fff2b32dee ExpandableItem widget 4 years ago
Amjad Amireh be60383916 ListItem Expand 4 years ago
Amjad Amireh ae064cc14a Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 4 years ago
Amjad Amireh 8f860ab4cf Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into Amjad_search 4 years ago