Commit Graph

601 Commits (871bd6ab2086cdce271d4ccf15907c064e358ca3)
 

Author SHA1 Message Date
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
6 years ago
Elham Rababah fbc99d681f First step from medicine search and change the logo 6 years ago
Mohammad Aljammal 885b212193 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!159
6 years ago
Mohammad Aljammal 2e4f9fa335 Merge remote-tracking branch 'origin/development' into development 6 years ago
Mohammad Aljammal 5eae2f9519 fix merge issues 6 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
6 years ago
Elham b2dce2e8a7 Merge branch 'dashboard_design' into 'development'
Dashboard design

See merge request Cloud_Solution/doctor_app_flutter!157
6 years ago
Elham Rababah d28d2ecdeb add improvement dashboard screen design 6 years ago
Elham Rababah dff6c25031 add improvement dashboard screen design 6 years ago
Elham Rababah e37a3e8ce1 Finish dashboard screen design 6 years ago
Mohammad Aljammal 0ec443c588 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!156
6 years ago
Sultan Khan 6eb2da3770 voice search 6 years ago
Elham 9f1b04512b Merge branch 'hussam' into 'development'
Hussam

See merge request Cloud_Solution/doctor_app_flutter!155
6 years ago
hussam al-habibeh efc5db9f5b versionID update 6 years ago
hussam al-habibeh ba72d40deb Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into hussam 6 years ago
Sultan Khan dca7cf9b05 Merge branch 'speech_to_text' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Amjad Amireh fb8c77afa4 add speech_to_text plugin 6 years ago
Elham e374471407 Merge branch 'hussam' into 'development'
Fixing Clinic name in app reopening

See merge request Cloud_Solution/doctor_app_flutter!154
6 years ago
hussam al-habibeh b6d2cdb1db fixing clinic name in app reopening 6 years ago
hussam al-habibeh 0444d6803c verification Screen Fixed 6 years ago
Sultan Khan e942999784 Merge branch 'master' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 6 years ago
Sultan Khan 3f7ef48fd5 live care chages 6 years ago
hussam al-habibeh d449086f9a Fixing Clinic name in app reopening 6 years ago
Mohammad Aljammal 4dedcbad80 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!153
6 years ago
Elham 2fe33bd57d Merge branch 'hussam' into 'development'
LogIn function refactoring

See merge request Cloud_Solution/doctor_app_flutter!152
6 years ago
hussam al-habibeh d3bb85129c LogIn function refactoring 6 years ago
Mohammad Aljammal e78a7d35e3 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!151
6 years ago
Mohammad Aljammal ba98afcde3 Merge branch 'elham' into 'development'
Elham

See merge request Cloud_Solution/doctor_app_flutter!150
6 years ago
Elham Rababah 7c7916af5a make base url daynamic 6 years ago
Mohammad Aljammal 2a5b0c6683 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!149
6 years ago
Mohammad ALjammal d4b3e42070 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
 Conflicts:
	lib/screens/dashboard_screen.dart
6 years ago
Mohammad Aljammal dbef3fa449 Merge branch 'hussam' into 'development'
get clinic list after changing the language

See merge request Cloud_Solution/doctor_app_flutter!148
6 years ago
Elham Rababah 287bb20d12 fix issues ios 6 years ago
Elham Rababah 28ffcb12a2 Merge branch 'open_tok_call_back' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah 6ea72f5ffa make things daynamic 6 years ago
Mohammad ALjammal d5825ccb85 fix issues 6 years ago
Elham Rababah 9ed9e3ed73 Merge branch 'open_tok_call_back' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into elham 6 years ago
Elham Rababah 693effd6b7 first step form calling API 6 years ago
Mohammad ALjammal d22ce32cdb add call back android 6 years ago
hussam al-habibeh acaaca314e get clinic list after changing the language 6 years ago
hussam alhababieh 655f044407 Merge branch 'hussam' into 'development'
Hussam

See merge request Cloud_Solution/doctor_app_flutter!146
6 years ago
hussam al-habibeh aa57f4c4d7 get clinic list after changing the language 6 years ago
Elham Rababah 1e27edf09f kill the session after 30 second 6 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
6 years ago
hussam al-habibeh d866d8b9de get clinic list 6 years ago
Elham Rababah 8db2f059ba add call back fun for end call 6 years ago
Mohammad Aljammal 9cbc3cfb82 Merge branch 'development' into 'master'
Development

See merge request Cloud_Solution/doctor_app_flutter!145
6 years ago
Mohammad Aljammal c8f558d50f Merge branch 'ios-opentok' into 'development'
Ios opentok

See merge request Cloud_Solution/doctor_app_flutter!144
6 years ago
Mohammad Aljammal 9dc1c27334 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!143
6 years ago
Sultan Khan 8a9d20990b Video call page updated 6 years ago