Mohammad Aljammal
|
7f23f356f1
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!151
|
4 years ago |
Mohammad Aljammal
|
4e2c955b09
|
add missing translation
|
4 years ago |
haroon amjad
|
dfa1952f4d
|
Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app
|
4 years ago |
hussam al-habibeh
|
5dc3c53550
|
mousa and hussam branch
|
4 years ago |
|
hussam al-habibeh
|
a1906a4072
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
4 years ago |
|
hussam al-habibeh
|
800565407d
|
12/6
|
4 years ago |
mosazaid
|
4c9a1862d2
|
make pharmacy home page load data even without login, and some mini changes
|
4 years ago |
haroon amjad
|
257dc3d76d
|
Merge branch 'pharmacy_module_feature_home_page' into 'pharmacy'
create terms-condition in pharmacy order page
See merge request Cloud_Solution/diplomatic-quarter!154
|
4 years ago |
|
mosazaid
|
7ee7ef58c4
|
working on dynamic title on pharmacy
|
4 years ago |
 umasoodch
|
b5413d1749
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/localized_values.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
mosazaid
|
709ba2ce97
|
create terms-condition in pharmacy order page
|
4 years ago |
|
mosazaid
|
2a91ae787f
|
commit
|
4 years ago |
|
hussam al-habibeh
|
8b8207cb0d
|
search
|
4 years ago |
Sultan Khan
|
e34a5c3c13
|
multiple login calls fixed
|
4 years ago |
|
Sultan Khan
|
f5b7d35f23
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
d69b3676a4
|
weather indicator in progress
|
4 years ago |
|
hussam al-habibeh
|
64cbae3602
|
Search
|
4 years ago |
|
Sultan Khan
|
81c8239412
|
bug fixes
|
4 years ago |
|
Sultan Khan
|
fc0117754d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
ced86de9fe
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into images_info
Conflicts:
lib/config/localized_values.dart
lib/pages/medical/balance/advance_payment_page.dart
lib/pages/medical/balance/my_balance_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
269f682bd5
|
Added info images description
|
4 years ago |
|
mosazaid
|
35d0d3e441
|
finsi lakum points task
|
4 years ago |
|
haroon amjad
|
f1a8e09a59
|
Added info images description
|
4 years ago |
|
haroon amjad
|
47b030eb82
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# ios/Flutter/.last_build_id
# lib/config/config.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
haroon amjad
|
7edb0c8009
|
Doctor rating dialog revamped
|
4 years ago |
|
Sultan Khan
|
3a055aa02b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
79c17de0de
|
ltr issue fixed
|
4 years ago |
|
Mohammad Aljammal
|
3daef6e53f
|
add images info
|
4 years ago |
|
Mohammad Aljammal
|
dc898a799d
|
Add Privileges
|
4 years ago |
Elham Rababah
|
713e44cf8b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Elham Rababah
|
ea195ea9bf
|
Finish translate CMC HHC
|
4 years ago |
|
haroon amjad
|
4f1f7dcefd
|
ereferral implementation completed
|
4 years ago |
|
haroon amjad
|
65fbd7af8e
|
referral finalised
|
4 years ago |
Zohaib Kambrani
|
1155466d19
|
Packages and Offer Slider at home
|
4 years ago |
|
mosazaid
|
98f660e29b
|
Merge branch 'pharmacy' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
mosazaid
|
951c77feb5
|
working on lakum account
|
4 years ago |
|
mosazaid
|
4e5d6a9a00
|
finish pharmacy home page , cart page, orders and payment page, recently viewed , and lakum module almost finished
|
4 years ago |
|
Elham Rababah
|
5bf63174c9
|
First step from translations
|
4 years ago |
|
haroon amjad
|
82e23efd32
|
working on ereferral
|
4 years ago |
|
umasoodch
|
0431eb1ac8
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/locator.dart
# lib/pages/base/base_view.dart
# lib/pages/landing/home_page.dart
# lib/widgets/others/app_scaffold_widget.dart
# pubspec.yaml
|
4 years ago |
|
haroon amjad
|
6846a8501a
|
Merge branch 'master' 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
|
4 years ago |
|
haroon amjad
|
0181043da8
|
Ereferral fixes, smartwatch health data integration
|
4 years ago |
|
Mohammad Aljammal
|
2185f5ce11
|
Merge branch 'hhc_cmc' into 'master'
Hhc cmc
See merge request Cloud_Solution/diplomatic-quarter!138
|
4 years ago |
|
Elham Rababah
|
1e1677a365
|
naming issue fix
|
4 years ago |
|
Elham Rababah
|
05deaa6322
|
Address Added Successfully
|
4 years ago |
|
Elham Rababah
|
68e4b92717
|
Address Added Successfully
|
4 years ago |
|
Sultan Khan
|
de2a5e55eb
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
7d3c1ac852
|
weather indicator updated
|
4 years ago |
|
Sultan Khan
|
648d9d245d
|
health weather indicator
|
4 years ago |
|
Zohaib Kambrani
|
27182ee8db
|
no message
|
4 years ago |
|
Elham Rababah
|
ed56476d81
|
second step from location fixes
|
4 years ago |
|
Mohammad Aljammal
|
54d8965773
|
done child Vaccination
|
4 years ago |
|
haroon amjad
|
97b8aeeff5
|
Version Control finished
|
4 years ago |
|
Sultan Khan
|
e7c862c801
|
health weather indicator
|
4 years ago |
|
Elham Rababah
|
7aa7af6de7
|
finish CMC module
|
4 years ago |
|
haroon amjad
|
92db2b2be9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
Elham Rababah
|
fd80afeb5a
|
finish hhc module
|
4 years ago |
|
Elham Rababah
|
3ef22be7da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hhc_cmc
Conflicts:
lib/config/config.dart
|
4 years ago |
|
Elham Rababah
|
a87855f445
|
Fix issues on hhc module
|
4 years ago |
|
Mohammad Aljammal
|
49974f81db
|
add translations to child Vaccination
|
4 years ago |
|
Sultan Khan
|
5e6bcadec0
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
603833db37
|
login changes
|
4 years ago |
|
haroon amjad
|
e5feef8a9d
|
Updates & UI Fixes
|
4 years ago |
|
Mohammad Aljammal
|
fa01d132c7
|
merger DQ live and fix some issues on Child Vaccines
|
4 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
|
4 years ago |
|
haroon amjad
|
01512e6332
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
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 |
|
haroon amjad
|
ebb8a8fa2c
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
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 |
|
haroon amjad
|
c74ac3b7ca
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
|
haroon amjad
|
85062859c8
|
updates
|
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 |
|
Zohaib Kambrani
|
8fcf1b6708
|
Swipe the Native loading « arguments
|
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 |
|
Zohaib Kambrani
|
69d1e4bb0b
|
no message
|
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 |
|
Zohaib Kambrani
|
0c71fbad5f
|
no message
|
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 |
|
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 |
|
hussam al-habibeh
|
6162833bba
|
offers products page
|
4 years ago |
|
hussam al-habibeh
|
7815005e21
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
hussam al-habibeh
|
69a6bc2812
|
offers page
|
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 |
|
mosazaid
|
11ff27bae3
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy_module_feature_home_page
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
4 years ago |
|
mosazaid
|
9a169ff77b
|
finish home page and start working on order preview page
|
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 |
enadhilal
|
778e9fd8da
|
Merge branch 'pharmacy_module_feature_home_page' into enad_pharmacy2
# Conflicts:
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/home_page.dart
|
4 years ago |
|
haroon amjad
|
dbb53e7821
|
fixed forgot password issue, Implemented new loader in login flow
|
4 years ago |
|
hussam al-habibeh
|
e74e168e88
|
Merge branch 'pharmacy_module_feature_home_page' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into pharmacy-hussam
Conflicts:
android/app/build.gradle
lib/config/config.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
|
4 years ago |
|
hussam al-habibeh
|
f7cee8f484
|
pharmacy module app && category home page
|
4 years ago |
|
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
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 |