Mohammad Aljammal
|
9b8599a2cf
|
remove load user from SplashScreen
|
5 years ago |
Mohammad Aljammal
|
935e72975c
|
add new privilege
|
5 years ago |
Mohammad Aljammal
|
dc898a799d
|
Add Privileges
|
5 years ago |
Mohammad Aljammal
|
54d8965773
|
done child Vaccination
|
5 years ago |
Mohammad Aljammal
|
49974f81db
|
add translations to child Vaccination
|
5 years ago |
Mohammad Aljammal
|
fa01d132c7
|
merger DQ live and fix some issues on Child Vaccines
|
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 |
Mohammad Aljammal
|
47c980a412
|
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
add Radiology translations and colors
See merge request Cloud_Solution/diplomatic-quarter!131
|
5 years ago |
Mohammad Aljammal
|
482ec536de
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fixing
Conflicts:
lib/config/config.dart
|
5 years ago |
Mohammad Aljammal
|
b6d2878cf1
|
add Radiology translations and colors
|
5 years ago |
Mohammad Aljammal
|
6cb3224226
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!129
|
5 years ago |
Sultan Khan
|
22676fcbd1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
5bb780c4ac
|
push
|
5 years ago |
Mohammad Aljammal
|
d0891ba16b
|
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix lab result translations and colors
See merge request Cloud_Solution/diplomatic-quarter!128
|
5 years ago |
Mohammad Aljammal
|
b504f379de
|
fix lab result translations and colors
|
5 years ago |
Mohammad Aljammal
|
2731c5b1d4
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!127
|
5 years ago |
Sultan Khan
|
d6a0188c76
|
fingerprint
|
5 years ago |
Sultan Khan
|
7c33c06c0c
|
fingerprint
|
5 years ago |
Sultan Khan
|
1b678e0aca
|
fingerprint
|
5 years ago |
Sultan Khan
|
6a14214a0f
|
no message
|
5 years ago |
Mohammad Aljammal
|
92b18bce07
|
Merge branch 'hot_fixing' into 'diplomatic-quarter-live'
fix vital Sign
See merge request Cloud_Solution/diplomatic-quarter!126
|
5 years ago |
Mohammad Aljammal
|
0ac599ea1c
|
fix vital Sign
|
5 years ago |
Mohammad Aljammal
|
caf930050f
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
Diplomatic quarter haroon
See merge request Cloud_Solution/diplomatic-quarter!125
|
5 years ago |
haroon amjad
|
10025103ac
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
haroon amjad
|
21c7c94ef2
|
updates & fixes
|
5 years ago |
Mohammad Aljammal
|
9fcf87126a
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!124
|
5 years ago |
Sultan Khan
|
b61e734f80
|
feedback permission
|
5 years ago |
Sultan Khan
|
6bbdf05f90
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
857fc813cd
|
button feedback
|
5 years ago |
Mohammad Aljammal
|
51a03b83fa
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
advance payment & payment flow issues fixed
See merge request Cloud_Solution/diplomatic-quarter!123
|
5 years ago |
Sultan Khan
|
29eaa26b36
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
571bda9100
|
permission
|
5 years ago |
haroon amjad
|
d284ceac04
|
advance payment & payment flow issues fixed
|
5 years ago |
Mohammad Aljammal
|
706cd13656
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!122
|
5 years ago |
Sultan Khan
|
8429f83d7c
|
registration done
|
5 years ago |
Sultan Khan
|
391e178484
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
8d499704dc
|
family file changes
|
5 years ago |
Mohammad Aljammal
|
2cb37bf8a0
|
Merge branch 'fix_prescriptions' into 'diplomatic-quarter-live'
Fix prescriptions
See merge request Cloud_Solution/diplomatic-quarter!121
|
5 years ago |
Mohammad Aljammal
|
91cada6901
|
fix Advance Payment
|
5 years ago |
Mohammad Aljammal
|
dcbc0de69f
|
fix prescription
|
5 years ago |
Mohammad Aljammal
|
4e31a79019
|
Merge branch 'fix_master' into 'master'
fix merge issues
See merge request Cloud_Solution/diplomatic-quarter!120
|
5 years ago |
Mohammad Aljammal
|
f70ca95a38
|
fix merge issues
|
5 years ago |
Mohammad Aljammal
|
85df92a0ca
|
Merge branch 'fix_master' into 'master'
Fix master
See merge request Cloud_Solution/diplomatic-quarter!119
|
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 |
Mohammad Aljammal
|
eb5727ef8a
|
fix master
|
5 years ago |
Mohammad Aljammal
|
776b20ff67
|
fix master
|
5 years ago |
Mohammad Aljammal
|
939840bbe7
|
fix master
|
5 years ago |
Mohammad Aljammal
|
67cc5e2033
|
fix Prescriptions
|
5 years ago |
Mohammad Aljammal
|
221091c5f0
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!118
|
5 years ago |
Sultan Khan
|
072e6cffef
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |