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
|
4 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
|
4 years ago |
Mohammad Aljammal
|
b6d2878cf1
|
add Radiology translations and colors
|
4 years ago |
Fatimah Alshammari
|
d328c74fc4
|
fix order and orderdetails
|
4 years ago |
Sultan Khan
|
22676fcbd1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
5bb780c4ac
|
push
|
4 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
|
4 years ago |
Mohammad Aljammal
|
b504f379de
|
fix lab result translations and colors
|
4 years ago |
Mohammad Aljammal
|
2731c5b1d4
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!127
|
4 years ago |
Sultan Khan
|
d6a0188c76
|
fingerprint
|
4 years ago |
Sultan Khan
|
7c33c06c0c
|
fingerprint
|
4 years ago |
Sultan Khan
|
6a14214a0f
|
no message
|
4 years ago |
Mohammad Aljammal
|
0ac599ea1c
|
fix vital Sign
|
4 years ago |
haroon amjad
|
10025103ac
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
haroon amjad
|
21c7c94ef2
|
updates & fixes
|
4 years ago |
Sultan Khan
|
6bbdf05f90
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
571bda9100
|
permission
|
4 years ago |
haroon amjad
|
d284ceac04
|
advance payment & payment flow issues fixed
|
4 years ago |
Sultan Khan
|
8429f83d7c
|
registration done
|
4 years ago |
Sultan Khan
|
391e178484
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
8d499704dc
|
family file changes
|
4 years ago |
Mohammad Aljammal
|
91cada6901
|
fix Advance Payment
|
4 years ago |
Mohammad Aljammal
|
dcbc0de69f
|
fix prescription
|
4 years ago |
Mohammad Aljammal
|
f70ca95a38
|
fix merge issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
939840bbe7
|
fix master
|
4 years ago |
Mohammad Aljammal
|
67cc5e2033
|
fix Prescriptions
|
4 years ago |
Sultan Khan
|
2f454055b9
|
login fixed
|
4 years ago |
Sultan Khan
|
18a2393d92
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
6e152951b4
|
notification count
|
4 years ago |
Mohammad Aljammal
|
0966269537
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!116
|
4 years ago |
Sultan Khan
|
d2f391ab7f
|
setting page inprogress
|
4 years ago |
Sultan Khan
|
00b0154987
|
my family
|
4 years ago |
Mohammad Aljammal
|
3c1257b379
|
fix Medicine Search
|
4 years ago |
Sultan Khan
|
30a8e24521
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
91be66ecdd
|
family file changes
|
4 years ago |
Mohammad Aljammal
|
b785f87dac
|
fix App drawer after logout
|
4 years ago |
Mohammad Aljammal
|
ddc7eca605
|
fix Insurance Cards
|
4 years ago |
Mohammad Aljmma
|
6523a1dea9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
Conflicts:
lib/config/localized_values.dart
|
4 years ago |
Sultan Khan
|
fdef34a394
|
viral sign issue
|
4 years ago |
Sultan Khan
|
3589b21590
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljmma
|
770d28033d
|
fix issues#26 & 27 & 28
|
4 years ago |
haroon amjad
|
b81af62551
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
b89c1f03b3
|
language translation fixes
|
4 years ago |
Sultan Khan
|
431306f0e1
|
insurance details
|
4 years ago |
Sultan Khan
|
1f4f81b454
|
insurance card details
|
4 years ago |
Sultan Khan
|
bedafa24cd
|
insurance details
|
4 years ago |
Sultan Khan
|
d81cc7119d
|
insurance details
|
4 years ago |
Mohammad Aljmma
|
8f38dc6077
|
fix issue #24
|
4 years ago |
Sultan Khan
|
a16145d7f1
|
bugfixes
|
4 years ago |
Sultan Khan
|
0eedb788c3
|
register page
|
4 years ago |
Sultan Khan
|
1eb6516ea6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
3fef1b9d52
|
theme and login issues fixed
|
4 years ago |
Mohammad Aljmma
|
e42ebfbf64
|
fix issue #16
|
4 years ago |
Mohammad Aljmma
|
59defa4532
|
fix issue #15
|
4 years ago |
Mohammad Aljmma
|
97a8fe4f9b
|
fix issue #14
|
4 years ago |
Mohammad Aljmma
|
5e8b61bf2d
|
fix issue #13
|
4 years ago |
Mohammad Aljmma
|
741126102d
|
fix issue #11
|
4 years ago |
Mohammad Aljmma
|
fdeac4823e
|
fix issue #10
|
4 years ago |
Mohammad Aljmma
|
20ece68ddb
|
fix issue # 6 & 7 & 8
|
4 years ago |
Mohammad Aljmma
|
216c5609c6
|
fix issue # 6 & 7 & 8
|
4 years ago |
Mohammad Aljmma
|
7b55454fde
|
fix issue#5
|
4 years ago |
Mohammad Aljmma
|
bfaacb2719
|
fix issue#3
|
4 years ago |
Mohammad Aljmma
|
5b3a4e674d
|
fix issue#2
|
4 years ago |
Mohammad Aljmma
|
27594f15b8
|
fix issue#1
|
4 years ago |
Mohammad Aljmma
|
e1f6ef5e5b
|
fix Prescriptions history
|
4 years ago |
Sultan Khan
|
58b1f648c1
|
setting theme
|
4 years ago |
hussam al-habibeh
|
69ea8b7bd7
|
daynmic products listing
|
4 years ago |
Sultan Khan
|
283473a06a
|
theme changes
|
4 years ago |
haroon amjad
|
9096ccd4d4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
Sultan Khan
|
f05b235cd0
|
login issue
|
4 years ago |
haroon amjad
|
2e484d7535
|
QR Code loading issue resolved
|
4 years ago |
Sultan Khan
|
cced69502a
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
haroon amjad
|
6062716209
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
haroon amjad
|
10efccbce8
|
my appointment fixes
|
4 years ago |
Sultan Khan
|
aec2ab75d0
|
settings update
|
4 years ago |
Sultan Khan
|
aa8f9f18e1
|
forgot password
|
4 years ago |
Fatimah Alshammari
|
ddf032bb47
|
Merge branch 'pharmacy' into pharmacy-Fatima
# Conflicts:
# android/app/build.gradle
# android/app/src/main/AndroidManifest.xml
# lib/config/config.dart
# lib/config/localized_values.dart
# lib/pages/landing/home_page.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Fatimah Alshammari
|
f137bd44c0
|
created order and order details UI pages
|
4 years ago |
Mohammad Aljmma
|
1111f26a9d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_family
|
4 years ago |
haroon amjad
|
9868a43e7b
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
4 years ago |
haroon amjad
|
05ad8f8db5
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
Sultan Khan
|
4976870d2e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
875bf10c73
|
settings page added
|
4 years ago |
Mohammad Aljmma
|
6a83538544
|
add info for Medical
|
4 years ago |
Mohammad Aljmma
|
a077d87dd8
|
fix user authentication data
|
4 years ago |
haroon amjad
|
ffbc7c4af4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/pages/landing/home_page.dart
|
4 years ago |
Mohammad Aljmma
|
7d2f1cf318
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication
|
4 years ago |
Mohammad Aljmma
|
570aa514cd
|
fix user authentication data
|
4 years ago |
haroon amjad
|
b7b7ead3ba
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
haroon amjad
|
ee67852970
|
Bottom navbar count & ToDo list fixed
|
4 years ago |
haroon amjad
|
f0897881d1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
haroon amjad
|
d75e5caf08
|
fixed appointment online checkIn issue
|
4 years ago |
Elham Rababah
|
124d388ee1
|
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
Conflicts:
lib/pages/BookAppointment/components/DocAvailableAppointments.dart
lib/pages/Covid-DriveThru/Covid-TimeSlots.dart
|
4 years ago |
Mohammad Aljmma
|
4a4d5248a2
|
fix status issue
|
4 years ago |
Elham Rababah
|
64f970c40c
|
Fix issues after the merge
|
4 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
|
4 years ago |
Elham Rababah
|
5ed4d76a54
|
Merge branches 'diplomatic-quarter-live' and 'notifications_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into notifications_page
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
haroon amjad
|
15a8e64e7c
|
updates & fixes
|
4 years ago |