Mirza.Shafique
|
876463c945
|
Home Page Font weight
|
4 years ago |
Sultan Khan
|
6b7eaaafb9
|
fixes
|
4 years ago |
Mirza.Shafique
|
38465eaafb
|
Home page icons and drawer
|
4 years ago |
Mirza.Shafique
|
06f877b8d4
|
Home page new design & drawer
|
4 years ago |
Sikander Saleem
|
083d696c62
|
Merge branch 'development' into development_new_design_2.0
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/login.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
f6ae7ed770
|
merge changes-4
|
4 years ago |
Sultan Khan
|
7c398ba40d
|
bug fix
|
4 years ago |
Mirza.Shafique
|
2665e4cd0c
|
Merge remote-tracking branch 'origin/development_new_design_2.0' into development_new_design_2.0
|
4 years ago |
Mirza.Shafique
|
a20185b2b9
|
Home page 1.4 (Homepage changes)
|
4 years ago |
Sikander Saleem
|
2cb59a286f
|
Merge branch 'login_design_sikander' into development_new_design_2.0
|
4 years ago |
Sikander Saleem
|
473315f8a1
|
improvements
|
4 years ago |
Mirza.Shafique
|
3c438406b5
|
Merge branch 'mirza_home_page' into development_new_design_2.0
# Conflicts:
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sikander Saleem
|
53e4815866
|
no auth ui modifications
|
4 years ago |
Mirza.Shafique
|
49bfa2e9a7
|
Home page 1.3
|
4 years ago |
Zohaib Iqbal Kambrani
|
08e0ce52c8
|
Merge branch 'development' into ZohaibIqbalKambrani
* development:
fix bugs
|
4 years ago |
Zohaib Iqbal Kambrani
|
4abdd9bde7
|
no message
|
4 years ago |
Zohaib Iqbal Kambrani
|
882d5f090a
|
Merge branch 'zik-analytics' into ZohaibIqbalKambrani
* zik-analytics:
no message
|
4 years ago |
mosazaid
|
2e33c2b240
|
fix bugs
|
4 years ago |
Mirza.Shafique
|
5dc88f51c3
|
Home Page 1.0
|
4 years ago |
Zohaib Iqbal Kambrani
|
dbf525c484
|
no message
|
4 years ago |
Sultan Khan
|
14ef096c32
|
changes and fixes
|
4 years ago |
Sultan Khan
|
3d6858d0ec
|
bug fixes
|
5 years ago |
haroon amjad
|
e0ebb922ed
|
pharmacy fixes
|
5 years ago |
Sultan Khan
|
e61c26b853
|
Auto SMS, Themes, Voice Command
|
5 years ago |
Sultan Khan
|
b3e6c4efda
|
voice command changes
|
5 years ago |
Sultan Khan
|
9fca52efca
|
voice command
|
5 years ago |
Sultan Khan
|
3ac69692be
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
Sultan Khan
|
0213264b7f
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
3e441c55b2
|
fix bottom nav bar
|
5 years ago |
Sultan Khan
|
ccd2fc5068
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
haroon amjad
|
6945230965
|
Merge branch 'development' into Haroon
# Conflicts:
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/pages/landing/home_page.dart
# lib/pages/medical/smart_watch_health_data/health_data_list.dart
# lib/pages/medical/smart_watch_health_data/smart_watch_instructions.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
5 years ago |
Sultan Khan
|
86cf9300e1
|
Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
* 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter: (136 commits)
Fix ER service
first step from fix CMC
fix issue on cmc
return CMC HHC
Nearest Er fix design
solving NearestEr design problem
simple fix
hot fixing
fix design issues
some design enhancments
fix design
fix android
fix merge issues
fix merge issues
commit
fix merge issues
change color
return privilege
return privilege
fix issues
...
|
5 years ago |
Zohaib Iqbal Kambrani
|
e2bce87e34
|
resolve merge conflicts.
|
5 years ago |
Zohaib Iqbal Kambrani
|
dc83b476d6
|
Merge branch 'development' into ZohaibIqbalKambrani
# Conflicts:
# android/app/src/main/kotlin/com/cloud/diplomaticquarterapp/utils/HMGUtils.kt
# ios/Flutter/.last_build_id
# lib/pages/landing/landing_page.dart
# lib/pages/medical/medical_profile_page.dart
# lib/widgets/drawer/app_drawer_widget.dart
|
5 years ago |
Mohammad Aljammal
|
952e106531
|
return privilege
|
5 years ago |
Mohammad Aljammal
|
f77d2b497e
|
fix issues
|
5 years ago |
Mohammad Aljammal
|
18dad434a0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_master
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/core/service/weather_service.dart
lib/core/viewModels/dashboard_view_model.dart
lib/main.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/AlHabibMedicalService/health-weather/health-weather-indicator.dart
lib/pages/BookAppointment/Search.dart
lib/pages/ErService/AmbulanceReq.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/pages/login/register.dart
lib/pages/medical/allergies_page.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/doctor/doctor_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
lib/pages/medical/vital_sign/vital_sign_details_screen.dart
lib/uitl/location_util.dart
lib/widgets/drawer/app_drawer_widget.dart
pubspec.yaml
|
5 years ago |
Mohammad Aljammal
|
6bda03e935
|
hot fixing
|
5 years ago |
Mohammad Aljammal
|
5e3f6363cf
|
fix issues
|
5 years ago |
Sultan Khan
|
8becd4f920
|
login issue fixed
|
5 years ago |
Sultan Khan
|
73c8e00852
|
bug fixes
|
5 years ago |
Mohammad Aljammal
|
2059b76fc1
|
fix Medical profile
|
5 years ago |
Zohaib Kambrani
|
508bc191be
|
geofencing login check fix
|
5 years ago |
Sultan Khan
|
a0baaac314
|
bug fixes
|
5 years ago |
Zohaib Kambrani
|
d8bd7d145d
|
no message
|
5 years ago |
Sultan Khan
|
040c8f38ab
|
hot fixes
|
5 years ago |
Mohammad Aljammal
|
3c2af11084
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
Conflicts:
lib/pages/landing/landing_page.dart
|
5 years ago |
Zohaib Kambrani
|
d8996cf879
|
Geofence Android Finished
|
5 years ago |
Mohammad Aljammal
|
d28870a629
|
fix merge issues
|
5 years ago |
Mohammad Aljammal
|
6d7cb1b970
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_dq_and_master
Conflicts:
ios/Runner.xcodeproj/project.pbxproj
lib/core/service/AuthenticatedUserObject.dart
lib/pages/landing/landing_page.dart
lib/pages/login/login.dart
lib/widgets/drawer/app_drawer_widget.dart
|
5 years ago |
Mohammad Aljammal
|
7167d58ce2
|
fix merge issues
|
5 years ago |
Mohammad Aljammal
|
aa89a05f1d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
ios/Flutter/.last_build_id
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/core/service/medical/prescriptions_service.dart
lib/core/viewModels/project_view_model.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/BookAppointment/BookConfirm.dart
lib/pages/BookAppointment/DoctorProfile.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/pages/MyAppointments/models/ArrivedButtons.dart
lib/pages/MyAppointments/widgets/AppointmentActions.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/ToDoList/ToDo.dart
lib/pages/feedback/send_feedback_page.dart
lib/pages/insurance/insurance_approval_screen.dart
lib/pages/insurance/insurance_card_screen.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/pages/medical/balance/my_balance_page.dart
lib/pages/medical/labs/laboratory_result_page.dart
lib/pages/medical/labs/labs_home_page.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/patient_sick_leave_page.dart
lib/pages/medical/prescriptions/prescription_details_page.dart
lib/pages/medical/prescriptions/prescription_items_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/pages/medical/radiology/radiology_home_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/pages/medical/reports/reports_page.dart
lib/pages/pharmacies/pharmacies_list_screen.dart
lib/pages/settings/profile_setting.dart
lib/services/authentication/auth_provider.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/buttons/floatingActionButton.dart
lib/widgets/data_display/medical/LabResult/LabResultWidget.dart
lib/widgets/data_display/medical/LabResult/laboratory_result_widget.dart
lib/widgets/data_display/medical/doctor_card.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Zohaib Kambrani
|
1dc9400ffc
|
Geofencing work in progress on android
|
5 years ago |
Sultan Khan
|
e312671e24
|
hot fixes
|
5 years ago |
Sultan Khan
|
cf642da661
|
landing page
|
5 years ago |
Sultan Khan
|
eec67ac930
|
big fixes
|
5 years ago |
Sultan Khan
|
8a554aa2f8
|
auth services fixed
|
5 years ago |
Sultan Khan
|
b759758a68
|
bug fixes
|
5 years ago |
Zohaib Kambrani
|
6f6ab8d987
|
no message
|
5 years ago |
Zohaib Kambrani
|
8457972fda
|
no message
|
5 years ago |
haroon amjad
|
951d9b553f
|
fixes & updates
|
5 years ago |
Zohaib Kambrani
|
92ba977fca
|
no message
|
5 years ago |
Sultan Khan
|
557b8e814f
|
voice command
|
5 years ago |
haroon amjad
|
1db5b15dcd
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
5 years ago |
haroon amjad
|
9ecaaa1b12
|
radiology fix in appointment details
|
5 years ago |
Sultan Khan
|
9d9d77ee3a
|
bug fixes
|
5 years ago |
Sultan Khan
|
188b72bb90
|
voice command
|
5 years ago |
Sultan Khan
|
e28209d4e8
|
bug fixes
|
5 years ago |
Sultan Khan
|
ce7a64e86e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
5 years ago |
haroon amjad
|
33956db22a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
|
5 years ago |
Mohammad Aljammal
|
9dfd8a71dc
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
Conflicts:
lib/locator.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/login/confirm-login.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/widgets/bottom_navigation/bottom_nav_bar.dart
lib/widgets/drawer/app_drawer_widget.dart
|
5 years ago |
Sultan Khan
|
7f44677242
|
voice command priv
|
5 years ago |
Mohammad Aljammal
|
935e72975c
|
add new privilege
|
5 years ago |
haroon amjad
|
cf6686e413
|
Merge branch 'master' into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
459ba828d9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/home_page.dart
lib/pages/medical/vital_sign/vital_sign_item.dart
lib/routes.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
5 years ago |
Sultan Khan
|
8c5746f7b1
|
bug fixes
|
5 years ago |
Sultan Khan
|
81c8239412
|
bug fixes
|
5 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
5 years ago |
Mohammad Aljammal
|
a556e8c1f8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/config.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
|
5 years ago |
Sultan Khan
|
5bb780c4ac
|
push
|
5 years ago |
Sultan Khan
|
7c33c06c0c
|
fingerprint
|
5 years ago |
Sultan Khan
|
8d499704dc
|
family file changes
|
5 years ago |
Mohammad Aljammal
|
0d098def04
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_master
Conflicts:
assets/app_icons/config.json
assets/app_icons/fonts/DQIcons.ttf
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/d_q_icons_icons.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/pages/rateAppointment/rate_appointment_doctor.dart
lib/uitl/utils.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Sultan Khan
|
2f454055b9
|
login fixed
|
5 years ago |
Sultan Khan
|
6e152951b4
|
notification count
|
5 years ago |
Sultan Khan
|
00b0154987
|
my family
|
5 years ago |
Zohaib Kambrani
|
69d1e4bb0b
|
no message
|
5 years ago |
Sultan Khan
|
1eb6516ea6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Mohammad Aljmma
|
5b3a4e674d
|
fix issue#2
|
5 years ago |
Mohammad Aljmma
|
27594f15b8
|
fix issue#1
|
5 years ago |
Sultan Khan
|
283473a06a
|
theme changes
|
5 years ago |
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
5 years ago |
haroon amjad
|
5020c24e8b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/services/authentication/auth_provider.dart
|
5 years ago |
Sultan Khan
|
b9b5797cbc
|
login issue fixed
|
5 years ago |
haroon amjad
|
4f53d058d4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
mosazaid
|
11ff27bae3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
5 years ago |
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
5 years ago |
Mohammad Aljmma
|
d4be20b07b
|
add icons
|
5 years ago |
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
5 years ago |
Mohammad Aljmma
|
856ab52439
|
fix ui issues
|
5 years ago |
Mohammad Aljmma
|
874de15040
|
change the home page design
|
5 years ago |
Mohammad Aljmma
|
d0ed776ff6
|
new home health service
|
5 years ago |
jammal
|
57f938aa09
|
fix ios issues
|
5 years ago |
jammal
|
0fceca8f3e
|
fix ios issues
|
5 years ago |
Sultan Khan
|
3ad928902b
|
voice command
|
5 years ago |
Sultan Khan
|
227731f8f8
|
Merge
|
5 years ago |
Sultan Khan
|
ea86e88e2e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
5c859034d6
|
voice search
|
5 years ago |
Mohammad Aljammal
|
3946f0355c
|
Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/landing/landing_page.dart
|
5 years ago |
Mohammad Aljammal
|
2952fd56ab
|
Done Active Medications Service
|
5 years ago |
Amjad amireh
|
c2cfea7360
|
Contact us
|
5 years ago |
haroon amjad
|
5400d534db
|
updates for push notifications
|
5 years ago |
Mohammad Aljammal
|
b0f0b87345
|
fix merge issues
|
5 years ago |
Mohammad Aljammal
|
68466c8d03
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/models/Appointments/DoctorListResponse.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
|
5 years ago |
Mohammad Aljammal
|
fe66ee5993
|
fix lab result issues
|
5 years ago |
Mohammad Aljammal
|
02ce04a397
|
medical_profile_page.dart
|
5 years ago |
Mohammad Aljammal
|
1b3a780a29
|
add ar lan for medical profile
|
5 years ago |
haroon amjad
|
13adb46319
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/config/shared_pref_kay.dart
|
5 years ago |
Mohammad Aljammal
|
54b766de81
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Mohammad Aljammal
|
01a011a03d
|
done dashboard page
|
5 years ago |
haroon amjad
|
96b7d00b4b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
5 years ago |
haroon amjad
|
30e08b4417
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/pages/login/login.dart
|
5 years ago |
haroon amjad
|
7a8392a97e
|
updates
|
5 years ago |
Sultan Khan
|
8516f7de1b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Mohammad Aljammal
|
30c0963063
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
8989fbc9b7
|
done design dashboard
|
5 years ago |
haroon amjad
|
61dba06236
|
Twilio implemented in LiveCare
|
5 years ago |
haroon amjad
|
cc4f5c0615
|
updates
|
5 years ago |
haroon amjad
|
5f1413a2ac
|
implementing Twilio in LiveCare
|
5 years ago |
haroon amjad
|
db30fbdfd2
|
implementing livecare
|
5 years ago |
Sultan Khan
|
47c42808fd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
913729fc58
|
speech search
|
5 years ago |
Sultan Khan
|
3b2f9251dc
|
search
|
5 years ago |
haroon amjad
|
7972d01dff
|
Insurance Approval implemented
|
5 years ago |
Mohammad Aljammal
|
125360ced7
|
fix merge issues
|
5 years ago |
Mohammad Aljammal
|
002efe3b45
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/pages/landing/landing_page.dart
|
5 years ago |
Mohammad Aljammal
|
cfd5b2ccff
|
feedback Service done
|
5 years ago |
Sultan Khan
|
8e3fb6831d
|
registration changes
|
5 years ago |
Sultan Khan
|
9d0a2e1e43
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
41b438fd74
|
login page changes
|
5 years ago |
Mohammad Aljammal
|
ec09721869
|
fix merge issues
|
5 years ago |
Mohammad Aljammal
|
5874f4ba21
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/pages/landing/landing_page.dart
|
5 years ago |
Sultan Khan
|
3a15c16883
|
login changes
|
5 years ago |
Mohammad Aljammal
|
8de50bfe74
|
medical - my doctor and prescription services and pages
|
5 years ago |
Sultan Khan
|
31fe444150
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
76aeeffad7
|
login page changes
|
5 years ago |
Mohammad Aljammal
|
93bfcbc20f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/pages/landing/landing_page.dart
pubspec.yaml
|
5 years ago |
Mohammad Aljammal
|
e147787be9
|
merge search and return medicine
|
5 years ago |
Mohammad Aljammal
|
01b230accf
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into SearchMedicineAndReturnMedicineList
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/main.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
|
5 years ago |
Mohammad Aljammal
|
4bc68c6afd
|
merge sultan
|
5 years ago |
Mohammad Aljammal
|
2d5b725818
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_merge
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
b2875fbce3
|
merge haroun
|
5 years ago |
hussam al-habibeh
|
31d2816e64
|
design for search medicine and return medicine list
|
5 years ago |
Mohammad Aljammal
|
3a68e0e092
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_haron
Conflicts:
lib/config/config.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Sultan Khan
|
5a08cb720c
|
login changes
|
5 years ago |
Mohammad Aljammal
|
fc749de77e
|
create doctor card and medical page
|
5 years ago |
Sultan Khan
|
f8d8e1c685
|
new pages added
|
5 years ago |
Sultan Khan
|
192b21a7e7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
# Conflicts:
# lib/main.dart
# lib/widgets/input/date_picker/button_actions.dart
# lib/widgets/input/text_field.dart
# lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
Mohammad Aljammal
|
257cc92691
|
add MVVM and di Mohammad Aljammal and Elham Rababah
|
5 years ago |