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 |
Elham Rababah
|
9f2beceb22
|
First step from notifications_page
|
5 years ago |
Mohammad Aljammal
|
f361793f39
|
Merge branch 'prescription_report_fix' into 'diplomatic-quarter-live'
fix prescription report issues
See merge request Cloud_Solution/diplomatic-quarter!95
|
5 years ago |
Mohammad Aljmma
|
e42f953bd1
|
fix prescription report issues
|
5 years ago |
haroon amjad
|
ff3368eefb
|
Login check implemented for appointment & ToDo
|
5 years ago |
Mohammad Aljammal
|
55e25fade8
|
Merge branch 'fix_login' into 'diplomatic-quarter-live'
Fix login
See merge request Cloud_Solution/diplomatic-quarter!94
|
5 years ago |
Mohammad Aljmma
|
54a7f98eff
|
fix login issues
|
5 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
|
5 years ago |
Mohammad Aljmma
|
f79d8eb8f9
|
fix login issues
|
5 years ago |
Mohammad Aljammal
|
625025c079
|
Merge branch 'diplomatic-quarter-haroon' into 'diplomatic-quarter-live'
fixed forgot password issue, Implemented new loader in login flow
See merge request Cloud_Solution/diplomatic-quarter!93
|
5 years ago |
haroon amjad
|
af780bca76
|
registration fixes
|
5 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
|
5 years ago |
haroon amjad
|
dbb53e7821
|
fixed forgot password issue, Implemented new loader in login flow
|
5 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
|
5 years ago |
hussam al-habibeh
|
f7cee8f484
|
pharmacy module app && category home page
|
5 years ago |
mosazaid
|
d1ac4080ca
|
working on pharmacy home page
|
5 years ago |
Mohammad Aljammal
|
8fe17a5cad
|
Merge branch 'home_page' into 'diplomatic-quarter-live'
Home page
See merge request Cloud_Solution/diplomatic-quarter!91
|
5 years ago |