Fatimah Alshammari
|
f137bd44c0
|
created order and order details UI pages
|
5 years ago |
Mohammad Aljammal
|
0222b484b7
|
Merge branch 'my_family' into 'diplomatic-quarter-live'
My family
See merge request Cloud_Solution/diplomatic-quarter!104
|
5 years ago |
Mohammad Aljmma
|
981020fce5
|
fix my family issues
|
5 years ago |
Mohammad Aljmma
|
1111f26a9d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_family
|
5 years ago |
haroon amjad
|
94fb41581e
|
config update
|
5 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
|
5 years ago |
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
5 years ago |
haroon amjad
|
05ad8f8db5
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
Sultan Khan
|
4976870d2e
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
875bf10c73
|
settings page added
|
5 years ago |
Mohammad Aljammal
|
de3b76446a
|
Merge branch 'info_medical' into 'diplomatic-quarter-live'
add info for Medical
See merge request Cloud_Solution/diplomatic-quarter!103
|
5 years ago |
Mohammad Aljmma
|
6a83538544
|
add info for Medical
|
5 years ago |
Mohammad Aljammal
|
620f824b0a
|
Merge branch 'fix_authentication' into 'diplomatic-quarter-live'
fix user authentication data
See merge request Cloud_Solution/diplomatic-quarter!102
|
5 years ago |
Mohammad Aljmma
|
a077d87dd8
|
fix user authentication data
|
5 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
|
5 years ago |
Mohammad Aljammal
|
332820885e
|
Merge branch 'fix_authentication' into 'diplomatic-quarter-live'
Fix authentication
See merge request Cloud_Solution/diplomatic-quarter!101
|
5 years ago |
Mohammad Aljmma
|
7d2f1cf318
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication
|
5 years ago |
Mohammad Aljmma
|
570aa514cd
|
fix user authentication data
|
5 years ago |
haroon amjad
|
b7b7ead3ba
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
haroon amjad
|
ee67852970
|
Bottom navbar count & ToDo list fixed
|
5 years ago |
haroon amjad
|
f0897881d1
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
Mohammad Aljammal
|
398bbe6f8d
|
Merge branch 'notifications_page' into 'diplomatic-quarter-live'
Notifications page
See merge request Cloud_Solution/diplomatic-quarter!99
|
5 years ago |
haroon amjad
|
d75e5caf08
|
fixed appointment online checkIn issue
|
5 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
|
5 years ago |
Mohammad Aljammal
|
625e40d7bf
|
Merge branch 'hot_login_fixing' into 'diplomatic-quarter-live'
fix status issue
See merge request Cloud_Solution/diplomatic-quarter!100
|
5 years ago |
Mohammad Aljmma
|
4a4d5248a2
|
fix status issue
|
5 years ago |
Elham Rababah
|
64f970c40c
|
Fix issues after the merge
|
5 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
|
5 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
|
5 years ago |
haroon amjad
|
15a8e64e7c
|
updates & fixes
|
5 years ago |
Elham Rababah
|
41b919183f
|
Fix bug on read notifications_page.dart
|
5 years ago |
Mohammad Aljammal
|
6d30156f1a
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!98
|
5 years ago |
Mohammad Aljmma
|
9880b0236b
|
fix my family issues
|
5 years ago |
Sultan Khan
|
0443a37886
|
register page updated
|
5 years ago |
Sultan Khan
|
b9b5797cbc
|
login issue fixed
|
5 years ago |
haroon amjad
|
89022231d7
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
hussam al-habibeh
|
6162833bba
|
offers products page
|
5 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
|
5 years ago |
hussam al-habibeh
|
69a6bc2812
|
offers page
|
5 years ago |
Elham Rababah
|
5bd3c7d9ce
|
finish step from notifications_page and create notification_details_page
|
5 years ago |
Sultan Khan
|
d939b2ec9b
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Sultan Khan
|
f8e05fc447
|
regiter issue
|
5 years ago |
Mohammad Aljammal
|
8baa3bd1a5
|
Merge branch 'prescription_report_fix' into 'diplomatic-quarter-live'
fix lab result
See merge request Cloud_Solution/diplomatic-quarter!97
|
5 years ago |
Mohammad Aljmma
|
747cffacfc
|
fix lab result
|
5 years ago |
haroon amjad
|
4f53d058d4
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
5 years ago |
Mohammad Aljammal
|
a691186ec7
|
Merge branch 'pharmacy_module_feature_home_page' into 'master'
Pharmacy module feature home page
See merge request Cloud_Solution/diplomatic-quarter!96
|
5 years ago |
mosazaid
|
2095f2c62a
|
fix merge issue
|
5 years ago |
mosazaid
|
dade295656
|
fix merge issue
|
5 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
|
5 years ago |
mosazaid
|
9a169ff77b
|
finish home page and start working on order preview page
|
5 years ago |