Commit Graph

956 Commits (8523211e9042a80101f737646014339de97527e3)

Author SHA1 Message Date
Elham Rababah a768dd63cf fix steps 4 years ago
Elham Rababah ed02bbc1f0 fix allergy 4 years ago
hussam al-habibeh 136c839c93 hot fixes 4 years ago
Elham Rababah d987859865 make allergies as expandable widget 4 years ago
Elham Rababah e6f2ed5197 change the add item box 4 years ago
Elham Rababah c1adb9eeff fix issues 4 years ago
Elham Rababah ff2c31ee35 allergies fixes 4 years ago
Elham Rababah 1ac67a7bc1 Merge branches 'allergyies' and 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into allergyies 4 years ago
Elham Rababah 19d8b9170d update allergies fixes 4 years ago
Mohammad Aljammal 3449567086 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
hussam al-habibeh 3795381e3b assessment fix 4 years ago
hussam al-habibeh b83c7835b9 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues
 Conflicts:
	lib/widgets/patients/profile/soap_update/steps_widget.dart
4 years ago
Mohammad Aljammal 7aadeb1a74 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
hussam al-habibeh 26672dbb6e Radiology details & assessment fix 4 years ago
mosazaid 7f440a2d8a fix soap screen height 4 years ago
Elham Rababah df3b51b957 update allergies 4 years ago
Mohammad Aljammal 87560250bb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
mosazaid e7fdf984f5 hot fix 4 years ago
Mohammad Aljammal 4bf9650b4f fix the design issues 4 years ago
mosazaid 583e06c5f2 re-design 4 years ago
mosazaid b735a69a4f bug fixes 4 years ago
mosazaid 8b6b7fe2e6 Merge branch 'development' into soap-objective-feature-re-design 4 years ago
mosazaid ef64c39a5f hot fix 4 years ago
mosazaid aeecc12cbe fix bug 4 years ago
Elham Rababah 7da729841e fix small issue in file path 4 years ago
Elham Rababah 518b09454b fix small bug 4 years ago
Elham Rababah 08a22d949c Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah 1330d680ab fix allergies 4 years ago
Mohammad Aljammal 283f07ec8a Merge branch 'soap-objective-feature-re-design' into 'development'
Soap objective feature re design

See merge request Cloud_Solution/doctor_app_flutter!442
4 years ago
mosazaid 5f245b8c27 Merge branch 'development' into soap-objective-feature-re-design 4 years ago
mosazaid 6e96dda6cd finish soap objective new design 4 years ago
hussam al-habibeh 1fba6c839c insurance approvals deatils fix 4 years ago
Elham Rababah fe39a22481 fix master key word 4 years ago
Elham Rababah 0d42163034 finish on history design 4 years ago
Mohammad Aljammal 3925255239 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!439
4 years ago
hussam al-habibeh 9adf55710e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 4 years ago
hussam al-habibeh 1d6f959342 assessment (SOAP) new design 4 years ago
Elham Rababah b70e41a558 Merge branches 'development' and 'soap_new_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design 4 years ago
Elham Rababah c8b44936f8 fix on history design 4 years ago
Mohammad Aljammal 2fbf48e676 fix font size 4 years ago
Mohammad Aljammal 0a00413639 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
4 years ago
mosazaid 3c696b6367 Merge branch 'development' into soap-objective-feature-re-design 4 years ago
mosazaid c69a64ea8a fix bug 4 years ago
Elham Rababah ee6288e26a Merge branches 'development' and 'soap_new_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design 4 years ago
Elham Rababah d2bd3b68e1 small fix on history 4 years ago
Mohammad Aljammal a6f104c352 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/patients/profile/patient-profile-header-new-design-app-bar.dart
	lib/widgets/patients/profile/patient_profile_header_with_appointment_card_app_bar.dart
4 years ago
Mohammad Aljammal ecccb2d068 fix font size 4 years ago
Mohammad Aljammal 3bca803715 Merge branch 'soap-objective-feature-re-design' into 'development'
Soap objective feature re design

See merge request Cloud_Solution/doctor_app_flutter!432
4 years ago
mosazaid 6826f8539c Merge branch 'development' into soap-objective-feature-re-design 4 years ago
mosazaid 0528323e15 fix patient card appbare bugs 4 years ago
Elham Rababah 654955fc76 fix label issue 4 years ago
Elham Rababah da0f932024 update Text Fields 4 years ago
Elham Rababah 8fd318548a finish chief complaint design 4 years ago
Elham Rababah 9559265a2d update chief complaint design 4 years ago
Elham Rababah d8cce04b8a fix replay design 4 years ago
Elham Rababah 5f482663dd fix the stepper 4 years ago
Elham Rababah e4f9d1f155 Merge branches 'development' and 'soap_new_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into soap_new_design 4 years ago
Mohammad Aljammal c00e38ae99 Merge branch 'soap_new_design' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
Elham Rababah 4f8047f751 fix small thing on design in schedule 4 years ago
Mohammad Aljammal 282337c923 Merge branch 'soap_new_design' into 'development'
fix steps widget

See merge request Cloud_Solution/doctor_app_flutter!427
4 years ago
Elham Rababah 6ba0576ee8 fix steps widget 4 years ago
Mohammad Aljammal 0ddc349eda Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/widgets/shared/doctor_card_insurance.dart
4 years ago
Mohammad Aljammal e84dd573fe fix the Procedure Card 4 years ago
Mohammad Aljammal 98c33d550d Merge branch 'fix-issues' into 'development'
insurance approvals design fix

See merge request Cloud_Solution/doctor_app_flutter!423
4 years ago
hussam al-habibeh 6300d3f0fc insurance approvals design fix 4 years ago
Mohammad Aljammal 765554d5e1 Merge branch 'patients-new-design' into 'development'
Patients new design

See merge request Cloud_Solution/doctor_app_flutter!422
4 years ago
Mohammad Aljammal 1df3c1b2c2 Merge branch 'soap_new_design' into 'development'
first step from design of subject page and ExpandableSOAPWidget

See merge request Cloud_Solution/doctor_app_flutter!420
4 years ago
Elham Rababah 5dcc875a0a first step from design of subject page and ExpandableSOAPWidget 4 years ago
mosazaid 9dc708fd3d Merge branch 'development' into patients-new-design 4 years ago
mosazaid 494f716f05 working on new design on vital sign and referral screens 4 years ago
Mohammad Aljammal 7f7f7611f3 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!419
4 years ago
hussam al-habibeh daa417a19b Insurance approval new design 4 years ago
Elham Rababah e041538fb8 small fix on schedule 4 years ago
hussam al-habibeh 03f39b8bab insurance approval new design 4 years ago
Mohammad Aljammal da370fc60a change the font size in patient card, fix the Drawer issue and change the app name in android 4 years ago
Mohammad Aljammal fa1a5c7099 hot fix 4 years ago
Mohammad Aljammal 0562d7f3cb Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
Mohammad Aljammal 36ef342a75 Merge branch 'fix-issues' into 'development'
AppBar Design update&Design Fixes

See merge request Cloud_Solution/doctor_app_flutter!410
4 years ago
hussam al-habibeh 5342d26c86 AppBar Design update&Design Fixes 4 years ago
Mohammad Aljammal 2cda29a3e2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
Mohammad Aljammal 3a8225e666 hot fix 4 years ago
mosazaid dd6e4f82cc Merge branch 'development' into patients-new-design 4 years ago
mosazaid c642d88804 some fixes 4 years ago
Mohammad Aljammal e978bd0df3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
Mohammad Aljammal 16f285fa63 add the image dialog 4 years ago
Mohammad Aljammal 4b1ace52ad Merge branch 'patients-new-design' into 'development'
Patients new design

See merge request Cloud_Solution/doctor_app_flutter!407
4 years ago
Mohammad Aljammal 4d29cf1c71 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!406
4 years ago
Mohammad Aljammal 2cfd62098a Merge branch 'schedule' into 'development'
Schedule

See merge request Cloud_Solution/doctor_app_flutter!405
4 years ago
mosazaid 46fffe56b6 small changes 4 years ago
mosazaid 19ca735560 Merge branch 'development' into patients-new-design 4 years ago
hussam al-habibeh 29029a7dea Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix-issues 4 years ago
hussam al-habibeh 709c11d103 Design Fixes 4 years ago
Mohammad Aljammal 6cd04996ec hot fix 4 years ago
mosazaid 914f15462f Merge branch 'development' into patients-new-design 4 years ago
mosazaid cc7c5af1d0 referral details fix bugs 4 years ago
Mohammad Aljammal 3fafa0ab01 add the patient cad as toolbar 4 years ago
Elham Rababah 3f342d8ce1 fix doctor replay 4 years ago
Elham Rababah 2ab012d503 fix drawer issue 4 years ago
mosazaid f7e0e89bce working on referral card 4 years ago
Mohammad Aljammal f62938076b Merge branch 'fix-issues' into 'development'
Removing old prescription screen

See merge request Cloud_Solution/doctor_app_flutter!398
4 years ago
Mohammad Aljammal bb2b64179b Merge branch 'schedule' into 'development'
small fix on replay page

See merge request Cloud_Solution/doctor_app_flutter!397
4 years ago
hussam al-habibeh 578cd58daa Removing old prescription screen 4 years ago
Mohammad Aljammal 34c0b0c119 Merge branch 'patients-new-design' into 'development'
finish Admission request new design

See merge request Cloud_Solution/doctor_app_flutter!394
4 years ago
Mohammad Aljammal d45b8a9cc5 change the font type in the app and Prescription 4 years ago
mosazaid f280ed731d finish Admission request new design 4 years ago
Elham Rababah 5714ed9540 small fix on replay page 4 years ago
Mohammad Aljammal 2bd505290d fix design 4 years ago
Mohammad Aljammal ba13ea7140 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!389
4 years ago
Mohammad Aljammal 920ec14bc2 add new design for Lab Result and Radiology Results 4 years ago
Mohammad Aljammal 1068eea248 Merge branch 'patients-new-design' into 'development'
Patients new design

See merge request Cloud_Solution/doctor_app_flutter!387
4 years ago
Mohammad Aljammal 5763970d23 Merge branch 'patient_app_services' into 'development'
Patient app services

See merge request Cloud_Solution/doctor_app_flutter!388
4 years ago
mosazaid 1f70498982 Merge branch 'development' into patients-new-design
# Conflicts:
#	lib/config/config.dart
4 years ago
Mohammad Aljammal 130d1442ea Merge branch 'schedule' into 'development'
Schedule

See merge request Cloud_Solution/doctor_app_flutter!386
4 years ago
mosazaid 6eaf448d5a working on new design for vital sign and admission request 4 years ago
Mohammad Aljammal 6fbd2076d4 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
Mohammad Aljammal 83762fbd6e change the lab result design 4 years ago
Mohammad Aljammal 7c9163bc48 Merge branch 'fix-issues' into 'development'
Add Prescription Form New Design

See merge request Cloud_Solution/doctor_app_flutter!384
4 years ago
hussam al-habibeh e4bfdd198b Add Prescription Form New Design 4 years ago
Elham Rababah f74fdc80f6 fix doctor replay 4 years ago
Sultan Khan 3c1a65f310 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan eadfe2d6bc bug fixes 4 years ago
Mohammad Aljammal 5a9cf7c8c2 Merge branch 'schedule' into 'development'
Schedule

See merge request Cloud_Solution/doctor_app_flutter!382
4 years ago
Elham Rababah 51191a560c Merge branches 'development' and 'schedule' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into schedule 4 years ago
Elham Rababah 8beab7d84f finish drawer 4 years ago
Mohammad Aljammal 747a0b7da4 change the lab result design 4 years ago
Mohammad Aljammal cdf923803e Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services 4 years ago
Mohammad Aljammal 019553ba51 new design for ESG service 4 years ago
Elham Rababah f78f178fd8 Merge branches 'development' and 'schedule' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into schedule 4 years ago
mosazaid 8237270e73 fix navigation problem to patient profile cards 4 years ago
mosazaid c97b395810 send patient type to patient profile cards 4 years ago
mosazaid 61a0e42afa paient and referral screens new design 4 years ago
Elham Rababah c1868d98a4 small fix 4 years ago
Elham Rababah f8c14a88ee fix schedule 4 years ago
mosazaid 7117540a24 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patients-new-design 4 years ago
mosazaid 27ff179750 working on referral screen bugs 4 years ago
Mohammad Aljammal d62df0052b Merge branch 'patient_app_services' into 'development'
Add new services to arrival patient

See merge request Cloud_Solution/doctor_app_flutter!376
4 years ago
Mohammad Aljammal 08b7b6263c Add new services to arrival patient 4 years ago
mosazaid b3b2beef70 Merge branch 'refferal_card' into patients-new-design 4 years ago
mosazaid ed104a4562 working on referral card 4 years ago
Sultan Khan b19c3092a6 bug fixes 4 years ago
mosazaid ffd77528a2 patient profile new design 4 years ago
Elham Rababah 4f558dc41d fix referral card 4 years ago
mosazaid 0ea66bd1e1 add the new design for the search patient 4 years ago
mosazaid 56f2b5f63a Merge branch 'development' into patients-new-design
# Conflicts:
#	lib/screens/patients/patients_screen.dart
#	lib/widgets/patients/profile/profile_medical_info_widget.dart
4 years ago
mosazaid 0e05b90c6b finish patient profile screen 4 years ago
Mohammad Aljammal a167db7651 Fix prescription items 4 years ago
Mohammad Aljammal 17f8b05748 Add prescriptions and radiology from the patient app 4 years ago
Sultan Khan 10ef8f7954 bug fixes 4 years ago
Sultan Khan 12dc637163 bug fixes 4 years ago
Sultan Khan d38c5ccd6b Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan c16b7ffca0 arrival page updated 4 years ago
Mohammad Aljammal 7dae41513f Add insurance approval services 4 years ago
Mohammad Aljammal e515265f11 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patient_app_services
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 0742d64428 add lab result services 4 years ago
Sultan Khan 495898f8c8 patient card 4 years ago
Mohammad Aljammal f8fba85150 Merge branch 'fix-issues' into 'development'
get Prescription history fix

See merge request Cloud_Solution/doctor_app_flutter!363
4 years ago
Elham Rababah 103a1bc6fc Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
 Conflicts:
	lib/config/localized_values.dart
	lib/screens/medicine/medicine_search_screen.dart
	lib/util/translations_delegate_base.dart
4 years ago
hussam al-habibeh 3928165570 get Prescription history fix 4 years ago
Mohammad Aljammal 770767ebb6 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!361
4 years ago
Mohammad Aljammal f74eadd987 Merge branch 'fix-issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!360
4 years ago
Sultan Khan bbb1a8ff74 arrival list updated 4 years ago
Elham Rababah 7ebf36f98f add radiology open image 4 years ago
mosazaid 6f3977d186 lab orders ui enhancements 4 years ago
hussam al-habibeh 53f45adf69 hussam 4 years ago
Sultan Khan 4d4d3b460d Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 27bbb9ac59 changes updated 4 years ago
Mohammad Aljammal 23b0b65df7 Merge branch 'clinic_list' into 'development'
Clinic list

See merge request Cloud_Solution/doctor_app_flutter!357
4 years ago
Elham Rababah 98c02be9a3 add progress note 4 years ago
Elham Rababah ed25195593 add lab result 4 years ago
Elham Rababah c10a0cf88e hot fix profile_medical_info_widget_search 4 years ago
Sultan Khan 94f0a7a448 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 5861d159ac bug fixes 4 years ago
Elham Rababah 7d85c8b692 return back the condition 4 years ago
Elham Rababah e7d1a6c805 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into clinic_list
 Conflicts:
	lib/screens/patients/patients_screen.dart
4 years ago
Mohammad Aljammal 22fc45ce16 Merge branch 'ecg_services' into 'development'
Ecg services

See merge request Cloud_Solution/doctor_app_flutter!353
4 years ago
Mohammad Aljammal 1af6115365 add ECG and Show sick leave 4 years ago
Elham Rababah 42666e2200 move clinic list to its own file 4 years ago
Sultan Khan 704d2484cf Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan cf7d494944 search pages and dashboard updated 4 years ago
hussam al-habibeh 15774e5b05 hussam 4 years ago
mosazaid 6c46e21031 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into development
# Conflicts:
#	lib/screens/dashboard_screen.dart
#	lib/screens/patients/patients_screen.dart
4 years ago
mosazaid fdc893c3d6 make search patient profile have preview services 4 years ago
Sultan Khan a8ef4a98a5 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 376653a344 dashboard changes 4 years ago
hussam al-habibeh 983f03108f adding prescription history & Medical file for all patient types 4 years ago
Mohammad Aljammal 893fc05449 Merge branch 'patinet_profile_with_all_service' into 'development'
Patinet profile with all service

See merge request Cloud_Solution/doctor_app_flutter!345
4 years ago
Elham Rababah a329c447a2 fix allergic in header 4 years ago
Elham Rababah 4190f32cdb return radiology and insurance approval 4 years ago
Elham Rababah 1843acbcb1 Merge branches 'development' and 'patinet_profile_with_all_service' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into patinet_profile_with_all_service 4 years ago
Elham Rababah 4d6795fcc0 show all services for all type of patient. 4 years ago
mosazaid 7c5d88f169 Merge branch 'development' into app_changes 4 years ago
mosazaid 9b02bdc541 inhancements 4 years ago
Sultan Khan 3f7961b50c dashboard sreen updated 4 years ago
Elham Rababah 8615671095 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into add_medication_details
 Conflicts:
	lib/util/translations_delegate_base.dart
4 years ago
Elham Rababah f3220be735 fix DA-350 4 years ago
Elham Rababah f819e6353e fix DA-350 4 years ago
Sultan Khan 63d73b60e1 ios faceid issue 4 years ago
Sultan Khan 9ed5a294ab dashboard changes 4 years ago
Sultan Khan 388c095d7f Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan a309acbf46 dashboard changes 4 years ago
Elham Rababah 083b49aa0a fix DA-341 4 years ago
Mohammad Aljammal d8d2e7f1d6 fix ios issues 4 years ago
Mohammad Aljammal 62d45d4e1c hide the keyboard when the user click on background 4 years ago
Mohammad Aljammal 60e416e632 add done button in all pages user keyboard and hide the keyboard when the user click on background 4 years ago
Mohammad Aljammal 8deba06957 Merge branch 'fix_patient_card' into 'development'
fix PatientCard

See merge request Cloud_Solution/doctor_app_flutter!304
4 years ago
Elham Rababah c8e5a7eeef fix PatientCard 4 years ago
mosazaid 4f302694b3 Merge branch 'development' into fix-bugs10_2 4 years ago
mosazaid 498c6c00af fix minor issue bugs (DA-273, DA-361, DA-362, DA-363) 4 years ago
Mohammad Aljammal d41fd496b6 Merge branch 'fix-issues' into 'development'
fixing bugs

See merge request Cloud_Solution/doctor_app_flutter!300
4 years ago
Sultan Khan f0539860c2 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 400f8e25f6 bug xis 4 years ago
hussam al-habibeh 5bde14813a fixing bugs 4 years ago
Elham Rababah a1c60e692f Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Elham Rababah 248367fbe9 fix DA-220 4 years ago
Elham Rababah 753ef3bfb0 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues 4 years ago
Elham Rababah a5a7425a09 fix DA-149 4 years ago
mosazaid a618292d20 bug fixes for DA-284-DA-285 4 years ago
mosazaid f87f851100 Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/core/service/base/lookup-service.dart
#	lib/util/translations_delegate_base.dart
4 years ago
mosazaid 2b3a7f33d1 working on some bug fixes and finish addmission request 4 years ago
Mohammad Aljammal 05ed1202fe Merge branch 'fix_issues' into 'development'
Fix issues

See merge request Cloud_Solution/doctor_app_flutter!293
4 years ago
Mohammad Aljammal 127b5eb4bd Merge branch 'fix-issues' into 'development'
fix bugs

See merge request Cloud_Solution/doctor_app_flutter!292
4 years ago
Elham Rababah 34d5ac7d43 add label on assessment and fix DA-333 4 years ago
hussam al-habibeh 6dd1d9ef90 fix bugs 4 years ago
Sultan Khan 8b7acf7202 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan 6a23c2a137 bug fix 4 years ago
Elham Rababah 7505a6b6b0 fix  allergy 4 years ago
Elham Rababah 6a5e134527 fix  remark and step widget 4 years ago
Elham Rababah cfb9ea30cb fix : DA-335 4 years ago
Elham Rababah e652752729 fix : DA-334 4 years ago
Mohammad Aljammal 8b992b4189 Merge branch 'development' into 'fix_issues'
# Conflicts:
#   lib/config/localized_values.dart
4 years ago
Elham Rababah 437ae3dfb5 Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Elham Rababah febdadc924 fix : DA-264 4 years ago
Elham Rababah 34692b94c2 fix : DA-264 4 years ago
mosazaid de1d0283d2 some lables and translation changes and add search functionality for ListSelectDialog 4 years ago
Elham Rababah b9b5ec09e4 fix : DA-248 4 years ago
mosazaid c2df291029 DA - 286 Fix 4 years ago
Mohammad Aljammal abcd7e9833 Merge branch 'fix_issues' into 'development'
remark fix in allergies

See merge request Cloud_Solution/doctor_app_flutter!280
4 years ago
Elham Rababah 6820e2d097 remark fix in allergies 4 years ago
Mohammad Aljammal 6253e2c9a3 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_ios
 Conflicts:
	lib/util/translations_delegate_base.dart
4 years ago
Mohammad Aljammal 75efcde0bc fix ios 4 years ago
Mohammad Aljammal fa94b60711 Merge branch 'feature-ucaf' into 'development'
translation

See merge request Cloud_Solution/doctor_app_flutter!278
4 years ago
Mohammad Aljammal 3cfb88b313 Merge branch 'sultan' into 'development'
Sultan

See merge request Cloud_Solution/doctor_app_flutter!277
4 years ago
mosazaid 2273808333 translation 4 years ago
mosazaid cca4e33fce Merge branch 'development' into feature-ucaf
# Conflicts:
#	lib/config/localized_values.dart
#	lib/util/translations_delegate_base.dart
4 years ago
Sultan Khan ed3b42d721 Merge branch 'development' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into sultan 4 years ago
Sultan Khan d34744e168 bug fix 4 years ago
mosazaid ebc5ba7743 some fixes 4 years ago
Elham Rababah 7db8a42adc Merge branches 'development' and 'fix_issues' of https://gitlab.com/Cloud_Solution/doctor_app_flutter into fix_issues
 Conflicts:
	lib/config/localized_values.dart
	lib/util/translations_delegate_base.dart
4 years ago
mosazaid e75318799f Merge branch 'development' into feature-ucaf 4 years ago
mosazaid ac9fd8c936 samll fixes for labels and msges 4 years ago