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 |
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 |
|
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 |
 umasoodch
|
23083fd5ad
|
Merge branch 'master' into pharmacy
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
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 |
|
Mohammad Aljmma
|
874de15040
|
change the home page design
|
4 years ago |
|
Mohammad Aljammal
|
94c25d2188
|
Merge branch 'loader' into 'diplomatic-quarter-live'
Loader
See merge request Cloud_Solution/diplomatic-quarter!84
|
4 years ago |
|
Elham Rababah
|
6f5b5ed0c2
|
move gif loader utils
|
4 years ago |
|
Elham Rababah
|
bf412e1edf
|
Finish loader as Gif image in all cases where the network is busy
|
4 years ago |
|
haroon amjad
|
d5118bda11
|
Login / Register UI fixes
|
4 years ago |
|
haroon amjad
|
3354058738
|
Branding updated according to DQ
|
4 years ago |
|
haroon amjad
|
3ae6df1dcb
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-live
|
4 years ago |
|
haroon amjad
|
6a630f6d33
|
logo & colors changed for login & registration flow
|
4 years ago |
|
Sultan Khan
|
deb828b4dd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljmma
|
26cf849f2b
|
hot fixing
|
4 years ago |
|
Mohammad Aljammal
|
50dffe9af9
|
Merge branch 'Haroon' into 'master'
Haroon
See merge request Cloud_Solution/diplomatic-quarter!74
|
4 years ago |
|
Mohammad Aljmma
|
d0ed776ff6
|
new home health service
|
4 years ago |
|
haroon amjad
|
dfa7e0e02f
|
updates & fixes
|
4 years ago |
|
haroon amjad
|
0b6cd845f1
|
implementing Smart Watch Integration
|
4 years ago |
|
haroon amjad
|
22ef24c4ff
|
Merge branch 'master' into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
|
4 years ago |
|
jammal
|
9328f942ba
|
done ER service
|
4 years ago |
|
Fatimah Alshammari
|
1e00b9a4d8
|
added my-profile
|
4 years ago |
|
Fatimah Alshammari
|
56aa60f871
|
Merge branch 'pharmacy' into pharmacy-Fatima
|
4 years ago |
|
jammal
|
7dc55f3378
|
Merge branch 'home_health_care' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into ios_issues
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/E-Referral/e_referral_index_page.dart
lib/pages/AlHabibMedicalService/h2o/h2o_index_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
jammal
|
bd2254491c
|
done ER service
|
4 years ago |
|
enadhilal
|
5445cced89
|
Merge branch 'master' into enad_pharmacy2
# Conflicts:
# lib/config/config.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
jammal
|
57f938aa09
|
fix ios issues
|
4 years ago |
|
jammal
|
0fceca8f3e
|
fix ios issues
|
4 years ago |
|
enadhilal
|
7ca6e6caa7
|
fix widget of product_tile
|
4 years ago |
|
enadhilal
|
d6d1c26c9a
|
add product_tile widget
|
4 years ago |
|
enadhilal
|
068382e76f
|
add call for backend service
|
4 years ago |
|
haroon amjad
|
68b0e3857a
|
updates
|
4 years ago |
|
Sultan Khan
|
f03a711dff
|
symptom checker gender page updated
|
4 years ago |
|
haroon amjad
|
6b316bf262
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/config.dart
# lib/pages/AlHabibMedicalService/ health_calculators.dart
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
|
4 years ago |
|
enadhilal
|
815bc39268
|
add wishlist page
|
4 years ago |
|
haroon amjad
|
7edb6fd179
|
UI Fixes in LiveCare
|
4 years ago |
|
Mohammad Aljammal
|
e025321c71
|
fix issues
|
4 years ago |
|
Mohammad Aljammal
|
29f0402cbd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
Conflicts:
lib/config/config.dart
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/pages/AlHabibMedicalService/ health_calculators.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/MyAppointments/widgets/AppointmentCardView.dart
lib/pages/login/confirm-login.dart
lib/pages/login/login.dart
lib/services/appointment_services/GetDoctorsList.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/drawer/app_drawer_widget.dart
lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
Mohammad Aljammal
|
d3d0fa00e7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
Conflicts:
lib/pages/landing/home_page.dart
|
4 years ago |
|
Mohammad Aljammal
|
e7cf452a79
|
Merge branch 'insurance' into 'master'
files import fix
See merge request Cloud_Solution/diplomatic-quarter!66
|
4 years ago |
|
Mohammad Aljammal
|
a31796322b
|
fix icons issue
|
4 years ago |
|
Mohammad Aljammal
|
15ac74fadb
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
Conflicts:
lib/pages/AlHabibMedicalService/ health_calculators.dart
|
4 years ago |
|
Mohammad Aljammal
|
53bbafdc2b
|
fix Authenticated User Object
|
4 years ago |
|
hussam al-habibeh
|
cd36749e4e
|
files import fix
|
4 years ago |
|
Sultan Khan
|
8095e56b32
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
3ad928902b
|
voice command
|
4 years ago |
|
Elham Rababah
|
a359a6cd1a
|
fix the loader issue
|
4 years ago |
|
Mohammad Aljammal
|
b0fa7811e5
|
Merge branch 'insurance' into 'master'
women health
See merge request Cloud_Solution/diplomatic-quarter!65
|
4 years ago |
|
Mohammad Aljammal
|
39a4020b69
|
Merge branch 'child_vaccines' into 'master'
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!64
|
4 years ago |
|
hussam al-habibeh
|
c6a9b66538
|
women health
|
4 years ago |
Amjad amireh
|
83735ab68d
|
modified Child vaccintion note
|
4 years ago |
|
haroon amjad
|
a8ee7db62b
|
fixes
# Conflicts:
# lib/config/config.dart
|
4 years ago |
|
haroon amjad
|
41d50e23e3
|
covid drivethru implemented
|
4 years ago |
|
Mohammad Aljammal
|
84bb68789d
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into haroon_s
Conflicts:
lib/config/config.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
lib/pages/ContactUs/findus/hospitrals_page.dart
lib/pages/ContactUs/findus/pharmacies_page.dart
|
4 years ago |
|
Mohammad Aljammal
|
06416b4934
|
add Not authenticated Page
|
4 years ago |
|
haroon amjad
|
5f36c900a4
|
fixes
|
4 years ago |
|
haroon amjad
|
0daa0dc683
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
|
Sultan Khan
|
da317431ba
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Elham Rababah
|
83ab1b4d61
|
fix issues in the services logic and add some translation
|
4 years ago |
|
Amjad amireh
|
8ddec0ad99
|
child Vaccines add new child modified
|
4 years ago |
|
Amjad amireh
|
67e3a13a95
|
child Vaccines add new child modified
|
4 years ago |
|
Fatimah Alshammari
|
d05988a679
|
added pharmacy folder
|
4 years ago |
|
Elham Rababah
|
da7131015e
|
remove print statements
|
4 years ago |
|
Mohammad Aljammal
|
847ccb9c07
|
Merge branch 'child_vaccines' into 'master'
Child vaccines
See merge request Cloud_Solution/diplomatic-quarter!62
|
4 years ago |
|
Amjad amireh
|
cb2a78e2ee
|
child Vaccines
|
4 years ago |
|
Sultan Khan
|
7b6135a6c7
|
voice search
|
4 years ago |
|
Sultan Khan
|
83bc2cddce
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
8f18d1025a
|
voice search
|
4 years ago |
|
Amjad amireh
|
24795e808f
|
child Vaccines
|
4 years ago |
|
hussam al-habibeh
|
84f429e559
|
merge
|
4 years ago |
|
hussam al-habibeh
|
bafcc4331e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into insurance
Conflicts:
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
pubspec.yaml
|
4 years ago |
|
hussam al-habibeh
|
dbda69baa1
|
health Calculator'General Health'
|
4 years ago |
|
Amjad amireh
|
dcb93bf5cc
|
child Vaccines
|
4 years ago |
|
Elham Rababah
|
9ebc6980dd
|
change the checkup item based on service
|
4 years ago |
|
Amjad amireh
|
1d29aa36a2
|
child Vaccines
|
4 years ago |
|
Mohammad Aljammal
|
1ce55e687f
|
Ambulance Service second step
|
4 years ago |
|
Amjad amireh
|
8a6511404f
|
child Vaccines
|
4 years ago |
|
Amjad amireh
|
42554ffa67
|
child Vaccines
|
4 years ago |
|
haroon amjad
|
063eebfc74
|
covid drivethru implemented
|
4 years ago |
|
Elham Rababah
|
31b217aa19
|
First step from CMC
|
4 years ago |
|
Amjad amireh
|
4009aed000
|
child Vaccines
|
4 years ago |
|
Sultan Khan
|
227731f8f8
|
Merge
|
4 years ago |
|
Amjad amireh
|
e14d619edd
|
child Vaccines
|
4 years ago |
|
Amjad amireh
|
37b817e0c8
|
child Vaccines
|
4 years ago |
|
Elham Rababah
|
0b9a834673
|
Finish cancel order
|
4 years ago |
|
Elham Rababah
|
293c557b54
|
First step from Home health care service
|
4 years ago |
|
Sultan Khan
|
ea86e88e2e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
3d6eafe473
|
Ambulance Service first step
|
4 years ago |
|
Amjad amireh
|
db19eec35f
|
Blood Denote
|
4 years ago |
|
Sultan Khan
|
5c859034d6
|
voice search
|
4 years ago |
|
Amjad amireh
|
42fd2e0eee
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into child_vaccines
Conflicts:
lib/core/viewModels/base_view_model.dart
|
4 years ago |
|
Amjad amireh
|
20ef255ee6
|
Blood Denote
|
4 years ago |
|
Amjad amireh
|
98947d5f6b
|
Blood Denote
|
4 years ago |
|
Mohammad Aljammal
|
0d12210116
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
|
4 years ago |
|
Mohammad Aljammal
|
c7d396875e
|
Ambulance Service steps
|
4 years ago |
|
Elham Rababah
|
fdc8ef36ef
|
Refactor today page
|
4 years ago |
|
Elham Rababah
|
0a60b27ab4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
Conflicts:
lib/locator.dart
|
4 years ago |
|
Mohammad Aljammal
|
ac871bb416
|
Merge branch 'Blood_Donation' into 'master'
Blood donation
See merge request Cloud_Solution/diplomatic-quarter!58
|
4 years ago |
|
Mohammad Aljammal
|
f543126152
|
Ambulance Service
|
4 years ago |
|
haroon amjad
|
6c0bb12c84
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
# lib/pages/BookAppointment/widgets/DoctorView.dart
# lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
# lib/pages/ContactUs/findus/hospitrals_page.dart
# lib/pages/ContactUs/findus/pharmacies_page.dart
|
4 years ago |
|
haroon amjad
|
929e289a6f
|
started implementing Covid-19 DriveThru Test Module
|
4 years ago |
|
Amjad amireh
|
b658e7be4d
|
Blood Denote
|
4 years ago |
|
Elham Rababah
|
dd76ae05a7
|
fix H2O page issue
|
4 years ago |
|
Amjad amireh
|
a00b3a133c
|
Blood Denote
|
4 years ago |
|
Amjad amireh
|
675d544514
|
Blood Denote
|
4 years ago |
|
haroon amjad
|
7fdc0da9dc
|
livecare scheduling implemented
|
4 years ago |
|
Amjad amireh
|
0ec39920f0
|
Blood Denote
|
4 years ago |
|
Amjad amireh
|
5e50c0dc32
|
Blood Denote
|
4 years ago |
|
Mohammad Aljammal
|
020d10fccc
|
Merge branch 'insurance' into 'master'
Health Converter
See merge request Cloud_Solution/diplomatic-quarter!56
|
4 years ago |
|
Elham Rababah
|
bf6a8cecc6
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/landing/landing_page.dart
pubspec.yaml
|
4 years ago |
|
Mohammad Aljammal
|
bae6fe4ad6
|
fix marge issues
|
4 years ago |
|
Elham Rababah
|
37d9eae9ea
|
improve E-referral
|
4 years ago |
|
Mohammad Aljammal
|
3946f0355c
|
Merge branches 'master' and 'my_trackers' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_trackers
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/landing/landing_page.dart
|
4 years ago |
|
Mohammad Aljammal
|
d6a27a8e28
|
change medical profile icons
|
4 years ago |
|
haroon amjad
|
c9256a654a
|
LiveCare Scheduling updates
|
4 years ago |
|
Mohammad Aljammal
|
3ffff9686d
|
Done allergies service
|
4 years ago |
|
Elham Rababah
|
c994c39c6b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
|
4 years ago |
|
Elham Rababah
|
a00bc8268e
|
improve E-referral
|
4 years ago |
|
Elham Rababah
|
91a8b94382
|
Merge branch 'E_referral' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into h20_E_referral
Conflicts:
lib/config/config.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/landing_page.dart
|
4 years ago |
|
Elham Rababah
|
b1b6c77d62
|
Finish H2O Services
|
4 years ago |
|
hussam al-habibeh
|
3e184f43db
|
Health Converter
|
4 years ago |
|
Elham Rababah
|
b853bede68
|
first step from h2o
|
4 years ago |
|
Amjad amireh
|
43689d19ce
|
Contact us , virtual tout ,News
|
4 years ago |
|
Mohammad Aljammal
|
82c2577d36
|
Done ask doctor service
|
4 years ago |
|
Amjad amireh
|
9a6eadc3fb
|
Contact us and virtual tout
|
4 years ago |
|
Sultan Khan
|
79502de682
|
update
|
4 years ago |
|
Sultan Khan
|
03ff56f2de
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
986a2e92f6
|
Merge branch 'find_us' into 'master'
Find us
See merge request Cloud_Solution/diplomatic-quarter!54
|
4 years ago |
|
Amjad amireh
|
7c48a6f16a
|
Contact us
|
4 years ago |
|
Amjad amireh
|
5ce252d296
|
Contact us
|
4 years ago |
|
Amjad amireh
|
50d862b076
|
Contact us
|
4 years ago |
|
Amjad amireh
|
97d0c439c7
|
Contact us
|
4 years ago |
|
Amjad amireh
|
5f981c9248
|
Contact us
|
4 years ago |
|
haroon amjad
|
06798ef327
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/pages/ContactUs/findus/hospitrals_page.dart
# lib/pages/ContactUs/findus/pharmacies_page.dart
|
4 years ago |
|
haroon amjad
|
f25d18353f
|
icons updated
|
4 years ago |
|
Sultan Khan
|
591e9e9a4c
|
updated
|
4 years ago |
|
Elham Rababah
|
ae147b5988
|
first step from search referrals
|
4 years ago |
|
Mohammad Aljammal
|
82226e62e1
|
Merge branch 'insurance' into 'master'
HMG Service layout
See merge request Cloud_Solution/diplomatic-quarter!52
|
4 years ago |
|
Mohammad Aljammal
|
2952fd56ab
|
Done Active Medications Service
|
4 years ago |
|
Elham Rababah
|
1e3ff89dbd
|
finish new e-referral except calling the service
|
4 years ago |
|
Amjad amireh
|
aa66e427b1
|
Contact us
|
4 years ago |
|
Amjad amireh
|
24456895ee
|
Contact us
|
4 years ago |
|
Amjad amireh
|
24693f2992
|
Contact us
|
4 years ago |
|
Amjad amireh
|
de5633d58b
|
Contact us
|
4 years ago |
|
hussam al-habibeh
|
3c5adc0a1d
|
HMG Service layout
|
4 years ago |
|
Elham Rababah
|
f582eee991
|
make index page of add new referral as page controller
|
4 years ago |
|
Amjad amireh
|
c2cfea7360
|
Contact us
|
4 years ago |
|
Amjad amireh
|
571023e521
|
Contact us
|
4 years ago |
|
Mohammad Aljammal
|
9f06ce7d1d
|
done EyeMeasurements service
|
4 years ago |
|
Amjad amireh
|
c2b7507005
|
Contact us
|
4 years ago |
|
Amjad amireh
|
dd3608e9ee
|
Contact us
|
4 years ago |
|
Elham Rababah
|
a4905783ad
|
refactor dialogs structure
|
4 years ago |
|
Elham Rababah
|
7840ec4c3b
|
finish activation process until step 2
|
4 years ago |
|
Mohammad Aljammal
|
c01e6095f2
|
done my trackers
|
4 years ago |
|
Amjad amireh
|
a4ea5f8e3e
|
Contact us
|
4 years ago |
|
Elham Rababah
|
f1f3b6bd56
|
first step from e-referral
|
4 years ago |
|
haroon amjad
|
b9a0438ebb
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
|
haroon amjad
|
a5fd9f53ab
|
Payment flow implemented in advance payment
|
4 years ago |
|
Mohammad Aljammal
|
14f3e08077
|
Merge branch 'amjad_amireh' into 'master'
edit card_position.dart
See merge request Cloud_Solution/diplomatic-quarter!47
|
4 years ago |
|
haroon amjad
|
478917b240
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
|
Mohammad Aljammal
|
b4a7408962
|
Merge branch 'payment_service' into 'master'
add payment service page and translations
See merge request Cloud_Solution/diplomatic-quarter!49
|
4 years ago |
|
Mohammad Aljammal
|
4ac77593ad
|
add payment service page and translations
|
4 years ago |
|
haroon amjad
|
38c980be81
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
|
haroon amjad
|
5400d534db
|
updates for push notifications
|
4 years ago |
|
Mohammad Aljammal
|
b6db1d1fd8
|
Merge branch 'my_balance' into 'master'
done My balance
See merge request Cloud_Solution/diplomatic-quarter!48
|
4 years ago |
|
Mohammad Aljammal
|
a0300738e8
|
done My balance
|
4 years ago |
|
Amjad amireh
|
368db03ab8
|
edit card_position.dart
|
4 years ago |
|
Amjad amireh
|
a41dd736c4
|
edit card_position.dart
|
4 years ago |
|
Amjad amireh
|
d1a01f5afa
|
edit card_position.dart
|
4 years ago |
|
Sultan Khan
|
92efbcbd2f
|
my family
|
4 years ago |
|
Sultan Khan
|
da7fa1038a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
0a2cb22042
|
design issues fixed
|
4 years ago |
|
Amjad amireh
|
6fb063bf48
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
|
4 years ago |
|
Amjad amireh
|
dc10f883db
|
Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
|
4 years ago |
|
Mohammad Aljammal
|
4dd3f9ad01
|
done Patient Sick Leave
|
4 years ago |
|
Amjad amireh
|
525080c09e
|
edit card_position.dart
|
4 years ago |
|
Mohammad Aljammal
|
57ed83a139
|
Merge branch 'vaccine' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into patient_sick_leave
Conflicts:
lib/config/config.dart
|
4 years ago |
|
Mohammad Aljammal
|
11f9daa3ff
|
add PatientSickLeave
|
4 years ago |
|
Sultan Khan
|
63e6d06e74
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
5e252d21d2
|
voice search added more medical option
|
4 years ago |
|
Mohammad Aljammal
|
fbb4b326a8
|
Merge branch 'amjad_amireh' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
Conflicts:
lib/locator.dart
pubspec.yaml
|
4 years ago |
|
Mohammad Aljammal
|
8e96c79d05
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into amjad_amireh
Conflicts:
lib/config/localized_values.dart
|
4 years ago |
|
Mohammad Aljammal
|
33bd972984
|
add my vaccines item screen
|
4 years ago |
|
Amjad amireh
|
62d96a3f1c
|
edit card_position.dart
|
4 years ago |
|
Sultan Khan
|
3dc54230be
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
9159928e27
|
edit on vaccine service
|
4 years ago |
|
Sultan Khan
|
a535543863
|
more pages added on the voice search
|
4 years ago |
|
Amjad amireh
|
e638464657
|
edit card_position.dart
|
4 years ago |
|
Mohammad Aljammal
|
ddf53ce999
|
ER
|
4 years ago |
|
Mohammad Aljammal
|
50d1e50df4
|
ER
|
4 years ago |