Mohammad Aljammal
|
5cee1cef4e
|
fix merge issues
|
5 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
|
5 years ago |
Sultan Khan
|
d1871bb71f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
8ee3b3b557
|
family files.
|
5 years ago |
hussam al-habibeh
|
492cfa084b
|
insurance card and insurance update and insurance approval
|
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
|
a84341af58
|
fix merge issues
|
5 years ago |
Mohammad Aljammal
|
5ea0df9f1e
|
Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
# lib/uitl/date_uitl.dart
|
5 years ago |
Mohammad Aljammal
|
7d230ea14c
|
fix issues
|
5 years ago |
Mohammad Aljammal
|
cfd5b2ccff
|
feedback Service done
|
5 years ago |
Sultan Khan
|
8e3fb6831d
|
registration changes
|
5 years ago |
Sultan Khan
|
e735855c33
|
registration done.
|
5 years ago |
Mohammad Aljammal
|
29768feefd
|
merge master
|
5 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
|
5 years ago |
Mohammad Aljammal
|
a12197fe70
|
labs result done add some file to git ignore for ios
|
5 years ago |
Sultan Khan
|
ecfa1756d3
|
login changes
|
5 years ago |
Sultan Khan
|
0bc529f420
|
login changes
|
5 years ago |
Mohammad Aljammal
|
1bbbd18373
|
labs services
|
5 years ago |
Sultan Khan
|
9d0a2e1e43
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
8d0834ff3e
|
login inprogress
|
5 years ago |
Mohammad Aljammal
|
940b327561
|
done Prescriptions
|
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 |
Mohammad Aljammal
|
5a38479254
|
fix merge issues
|
5 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
|
5 years ago |
Sultan Khan
|
3a15c16883
|
login changes
|
5 years ago |
Mohammad Aljammal
|
43349542da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
|
5 years ago |
Mohammad Aljammal
|
8de50bfe74
|
medical - my doctor and prescription services and pages
|
5 years ago |
hussam al-habibeh
|
e92cb2e1ac
|
Design and return Pharmacy List
|
5 years ago |
Sultan Khan
|
31fe444150
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
b0989d6ca0
|
login pages changes
|
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 |
Sultan Khan
|
5b411c3120
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
c018597d90
|
confrim login page added
|
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 |
Sultan Khan
|
8dd38a8b3c
|
no message
|
5 years ago |
haroon amjad
|
ca7b4534a8
|
Search By Clinic & Search By Doctor Name implemented
|
5 years ago |