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
|
536682e953
|
merge
|
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
|
a1684bdd9e
|
fix issue #17 & 18
|
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
|
0f938fafd2
|
fix issue #12
|
4 years ago |
|
Mohammad Aljmma
|
741126102d
|
fix issue #11
|
4 years ago |
|
Mohammad Aljmma
|
fdeac4823e
|
fix issue #10
|
4 years ago |
|
Mohammad Aljmma
|
179df475b4
|
fix issue #9
|
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
|
b913e5a7b7
|
fix issue#6
|
4 years ago |
|
Mohammad Aljmma
|
7b55454fde
|
fix issue#5
|
4 years ago |
|
Mohammad Aljmma
|
a742f896be
|
fix issue#4
|
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 |
|
Sultan Khan
|
283473a06a
|
theme changes
|
4 years ago |
|
Sultan Khan
|
d1336eec8b
|
login type
|
4 years ago |
|
Sultan Khan
|
c00391d3e5
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
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 |
|
Mohammad Aljmma
|
d76b679a7f
|
fix issues
|
4 years ago |
|
Mohammad Aljmma
|
6181e52ef1
|
fix authenticated user data
|
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 |
|
Mohammad Aljmma
|
981020fce5
|
fix my family issues
|
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
|
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 |
|
Elham Rababah
|
41b919183f
|
Fix bug on read notifications_page.dart
|
4 years ago |
|
Mohammad Aljmma
|
9880b0236b
|
fix my family issues
|
4 years ago |
|
Sultan Khan
|
0443a37886
|
register page updated
|
4 years ago |
|
Sultan Khan
|
b9b5797cbc
|
login issue fixed
|
4 years ago |
|
haroon amjad
|
89022231d7
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
Elham Rababah
|
5bd3c7d9ce
|
finish step from notifications_page and create notification_details_page
|
4 years ago |
|
Sultan Khan
|
d939b2ec9b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
f8e05fc447
|
regiter issue
|
4 years ago |
|
Mohammad Aljmma
|
747cffacfc
|
fix lab result
|
4 years ago |
|
haroon amjad
|
4f53d058d4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
Elham Rababah
|
9f2beceb22
|
First step from notifications_page
|
4 years ago |
|
Mohammad Aljmma
|
e42f953bd1
|
fix prescription report issues
|
4 years ago |
|
haroon amjad
|
ff3368eefb
|
Login check implemented for appointment & ToDo
|
4 years ago |
|
Mohammad Aljmma
|
54a7f98eff
|
fix login issues
|
4 years ago |
|
Mohammad Aljmma
|
a796e0392b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_login
Conflicts:
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
|
4 years ago |
|
Mohammad Aljmma
|
f79d8eb8f9
|
fix login issues
|
4 years ago |
|
haroon amjad
|
af780bca76
|
registration fixes
|
4 years ago |
|
haroon amjad
|
dbb53e7821
|
fixed forgot password issue, Implemented new loader in login flow
|
4 years ago |
|
Mohammad Aljmma
|
59d592778b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
|
4 years ago |
|
Mohammad Aljmma
|
e7e32a414b
|
fix barcode
|
4 years ago |
Mohammad Aljammal
|
1775766a08
|
Merge branch 'loader_fix' into 'diplomatic-quarter-live'
Fix loader issue.
See merge request Cloud_Solution/diplomatic-quarter!90
|
4 years ago |
|
Elham Rababah
|
fa88e9055f
|
make loader center
|
4 years ago |
|
Elham Rababah
|
042de21831
|
Fix loader issue.
|
4 years ago |
|
haroon amjad
|
aeab57beab
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/main.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
|
haroon amjad
|
f5a2870fac
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
Implemented Badge count on ToDo list & my appointments
|
4 years ago |
|
Mohammad Aljmma
|
479aea4df8
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljmma
|
d4be20b07b
|
add icons
|
4 years ago |
|
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
4 years ago |
|
haroon amjad
|
1553e71e7d
|
New loading dialog added into appointment flow
|
4 years ago |
|
Mohammad Aljmma
|
d5afb50ed3
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
lib/pages/landing/landing_page.dart
|
4 years ago |
|
Mohammad Aljmma
|
856ab52439
|
fix ui issues
|
4 years ago |
|
haroon amjad
|
6fd7a3fa3d
|
updates
|
4 years ago |
|
Mohammad Aljmma
|
89cfcd3cad
|
fix design issues
|
4 years ago |
|
Mohammad Aljmma
|
0b90d3c687
|
fix issues
|
4 years ago |
|
Mohammad Aljmma
|
894494ec4e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
Conflicts:
ios/Flutter/.last_build_id
lib/main.dart
lib/pages/landing/home_page.dart
|
4 years ago |