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 |
|
haroon amjad
|
192a3835d6
|
implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment.
|
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 |
|
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
|
20ab170e7a
|
Merge branch 'medical_profile' into 'master'
Medical profile
See merge request Cloud_Solution/diplomatic-quarter!9
|
4 years ago |
Mohammad Aljammal
|
ec09721869
|
fix merge issues
|
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
|
3e1311e8b8
|
Merge branch 'sultan' into 'master'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!7
|
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 |
|
Mohammad Aljammal
|
392a5a57ed
|
Merge branch 'SearchMedicineAndReturnMedicineList' into 'master'
Design and return Pharmacy List
See merge request Cloud_Solution/diplomatic-quarter!8
|
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
|
93bfcbc20f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/pages/landing/landing_page.dart
pubspec.yaml
|
4 years ago |
|
Mohammad Aljammal
|
ae2f9a077d
|
Merge branch 'SearchMedicineAndReturnMedicineList' into 'master'
design for search medicine and return medicine list
See merge request Cloud_Solution/diplomatic-quarter!6
|
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
|
bbb6dcd913
|
Merge branch 'sultan_merge' into 'master'
Sultan merge
See merge request Cloud_Solution/diplomatic-quarter!5
|
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
|
b2b6ce1f76
|
Merge branch 'merge_haron' into 'master'
Merge haroon
See merge request Cloud_Solution/diplomatic-quarter!4
|
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 |
|
Mohammad Aljammal
|
fc749de77e
|
create doctor card and medical page
|
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 |
|
Mohammad Aljammal
|
d02151bea8
|
fix import in main
|
4 years ago |