haroon amjad
|
fde47a5c2c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/core/service/client/base_app_client.dart
|
4 years ago |
|
haroon amjad
|
750746aabe
|
updates & fixes
|
4 years ago |
Mohammad Aljammal
|
d093ecd5e6
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
Conflicts:
ios/Podfile
ios/Runner.xcodeproj/project.pbxproj
lib/config/config.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
b4b33be3e9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
Conflicts:
lib/core/service/client/base_app_client.dart
|
4 years ago |
|
Mohammad Aljammal
|
37b874fe3f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
a1fa2c0727
|
done vital sign
|
4 years ago |
Sultan Khan
|
adbdd2dd0d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
621870eca1
|
family file changes
|
4 years ago |
|
haroon amjad
|
7d0efda1c4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/medical_profile_page.dart
# lib/services/authentication/auth_provider.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
4 years ago |
hussam al-habibeh
|
f77d4fac66
|
insurance translation
|
4 years ago |
Haroon Amjad
|
8ad2941836
|
Appointment payment finalised, Ask Doc implemeted & other updates
|
4 years ago |
|
Haroon Amjad
|
41c922bfeb
|
Appointment payment implemented, Book Success implemented, Appointment flow implemented
|
4 years ago |
|
haroon amjad
|
3a9fa97c91
|
updates
|
4 years ago |
|
Mohammad Aljammal
|
5cee1cef4e
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
2e0afdb49c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/prescriptions/prescriptions_home_page.dart
|
4 years ago |
|
Sultan Khan
|
d1871bb71f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
8ee3b3b557
|
family files.
|
4 years ago |
|
hussam al-habibeh
|
492cfa084b
|
insurance card and insurance update and insurance approval
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
5ea0df9f1e
|
Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
# lib/uitl/date_uitl.dart
|
4 years ago |
|
Mohammad Aljammal
|
cfd5b2ccff
|
feedback Service done
|
4 years ago |
|
Sultan Khan
|
8e3fb6831d
|
registration changes
|
4 years ago |
|
haroon amjad
|
28fde5c500
|
My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates
|
4 years ago |
|
Mohammad Aljammal
|
29768feefd
|
merge master
|
4 years ago |
|
Mohammad Aljammal
|
05222207da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
|
4 years ago |
|
Mohammad Aljammal
|
a12197fe70
|
labs result done add some file to git ignore for ios
|
4 years ago |
|
haroon amjad
|
00d9214460
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
Sultan Khan
|
ecfa1756d3
|
login changes
|
4 years ago |
|
Sultan Khan
|
0bc529f420
|
login changes
|
4 years ago |
|
Mohammad Aljammal
|
1bbbd18373
|
labs services
|
4 years ago |
|
Sultan Khan
|
9d0a2e1e43
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
8d0834ff3e
|
login inprogress
|
4 years ago |
|
haroon amjad
|
b3e5047820
|
Payment method selection page created, Appointment details functions implemented
|
4 years ago |
|
Mohammad Aljammal
|
940b327561
|
done Prescriptions
|
4 years ago |
|
haroon amjad
|
06f95c5379
|
Appointment Details implementation continued
|
4 years ago |
|
Sultan Khan
|
41b438fd74
|
login page changes
|
4 years ago |
|
haroon amjad
|
0171664779
|
Master Merged in to local
|
4 years ago |
|
haroon amjad
|
049d455e3c
|
Implementing appointment details functions
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
5a38479254
|
fix merge issues
|
4 years ago |
|
Mohammad Aljammal
|
1ac420ef7c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Sultan Khan
|
3a15c16883
|
login changes
|
4 years ago |
|
Mohammad Aljammal
|
43349542da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
|
4 years ago |
|
Mohammad Aljammal
|
8de50bfe74
|
medical - my doctor and prescription services and pages
|
4 years ago |
|
haroon amjad
|
f5ddfabf50
|
Todo list implemented, Appointment details implemented, Appointment Reschedule implemented, Appointment Confirmed implemented
|
4 years ago |
|
hussam al-habibeh
|
e92cb2e1ac
|
Design and return Pharmacy List
|
4 years ago |
|
haroon amjad
|
7f4fbadfab
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
|
4 years ago |
|
haroon amjad
|
d8fe501341
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
# lib/pages/BookAppointment/BookingOptions.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
Sultan Khan
|
31fe444150
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
b0989d6ca0
|
login pages changes
|
4 years ago |
|
Sultan Khan
|
76aeeffad7
|
login page changes
|
4 years ago |
|
Mohammad Aljammal
|
e147787be9
|
merge search and return medicine
|
4 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
|
4 years ago |
|
Sultan Khan
|
5b411c3120
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
c018597d90
|
confrim login page added
|
4 years ago |
|
haroon amjad
|
e34da6485b
|
Doctor Free Slots implemented
|
4 years ago |
|
Mohammad Aljammal
|
4bc68c6afd
|
merge sultan
|
4 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
|
4 years ago |
|
Mohammad Aljammal
|
b2875fbce3
|
merge haroun
|
4 years ago |
|
hussam al-habibeh
|
31d2816e64
|
design for search medicine and return medicine list
|
4 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
|
4 years ago |
|
Sultan Khan
|
5a08cb720c
|
login changes
|
4 years ago |
|
Sultan Khan
|
f8d8e1c685
|
new pages added
|
4 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
|
4 years ago |
|
Sultan Khan
|
8dd38a8b3c
|
no message
|
4 years ago |
|
haroon amjad
|
ca7b4534a8
|
Search By Clinic & Search By Doctor Name implemented
|
4 years ago |
|
Haroon Amjad
|
9eb9f01dbd
|
Get Clinic List API Implemented, Architecture for HTTP requests implemented
|
4 years ago |
|
haroon amjad
|
a0173c5b4d
|
Appointment Details page, ToDo List Page implemented
|
4 years ago |
Mohammad Aljammal
|
257cc92691
|
add MVVM and di Mohammad Aljammal and Elham Rababah
|
4 years ago |
|
haroon amjad
|
9842c3a0b1
|
Translation updates
|
4 years ago |
|
haroon amjad
|
1554a6bdf5
|
Book Appointment Flow added
|
4 years ago |
|
Sultan Khan
|
4a0cc17069
|
login module started
|
4 years ago |
|
Mohammad Aljammal
|
6d6c71655a
|
add new widget by Elham Rababah and Mohammad Aljammal
|
4 years ago |
|
Mohammad Aljammal
|
19676549e1
|
add base client, landing page, bottom_nav_bar , List Container, List Item, drawer progress indicator and asset file
|
4 years ago |
|
Mohammad Aljammal
|
3ed5c3878f
|
init project structure By Mohammad and Elham
|
4 years ago |