Mohammad Aljammal
|
935e72975c
|
add new privilege
|
5 years ago |
haroon amjad
|
cf6686e413
|
Merge branch 'master' into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/Covid-DriveThru/covid-drivethru-location.dart
# lib/uitl/translations_delegate_base.dart
|
5 years ago |
Mohammad Aljammal
|
459ba828d9
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
Conflicts:
lib/config/shared_pref_kay.dart
lib/core/service/client/base_app_client.dart
lib/locator.dart
lib/pages/AlHabibMedicalService/all_habib_medical_service_page.dart
lib/pages/landing/home_page.dart
lib/pages/medical/vital_sign/vital_sign_item.dart
lib/routes.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
pubspec.yaml
|
5 years ago |
Sultan Khan
|
8c5746f7b1
|
bug fixes
|
5 years ago |
|
Sultan Khan
|
81c8239412
|
bug fixes
|
5 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
5 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
|
5 years ago |
|
Sultan Khan
|
5bb780c4ac
|
push
|
5 years ago |
|
Sultan Khan
|
7c33c06c0c
|
fingerprint
|
5 years ago |
|
Sultan Khan
|
8d499704dc
|
family file changes
|
5 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
|
5 years ago |
|
Sultan Khan
|
2f454055b9
|
login fixed
|
5 years ago |
|
Sultan Khan
|
6e152951b4
|
notification count
|
5 years ago |
|
Sultan Khan
|
00b0154987
|
my family
|
5 years ago |
|
Zohaib Kambrani
|
69d1e4bb0b
|
no message
|
5 years ago |
|
Sultan Khan
|
1eb6516ea6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
Mohammad Aljmma
|
5b3a4e674d
|
fix issue#2
|
5 years ago |
|
Mohammad Aljmma
|
27594f15b8
|
fix issue#1
|
5 years ago |
|
Sultan Khan
|
283473a06a
|
theme changes
|
5 years ago |
|
haroon amjad
|
506e32e8c8
|
Payment issues resolved
|
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 |
|
Sultan Khan
|
b9b5797cbc
|
login issue fixed
|
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 |
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
|
d1ac4080ca
|
working on pharmacy home page
|
5 years ago |
|
Mohammad Aljmma
|
d4be20b07b
|
add icons
|
5 years ago |
|
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
5 years ago |
|
Mohammad Aljmma
|
856ab52439
|
fix ui issues
|
5 years ago |
|
Mohammad Aljmma
|
874de15040
|
change the home page design
|
5 years ago |
|
Mohammad Aljmma
|
d0ed776ff6
|
new home health service
|
5 years ago |
|
jammal
|
57f938aa09
|
fix ios issues
|
5 years ago |
|
jammal
|
0fceca8f3e
|
fix ios issues
|
5 years ago |
|
Sultan Khan
|
3ad928902b
|
voice command
|
5 years ago |
|
Sultan Khan
|
227731f8f8
|
Merge
|
5 years ago |
|
Sultan Khan
|
ea86e88e2e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
|
Sultan Khan
|
5c859034d6
|
voice search
|
5 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
|
5 years ago |
|
Mohammad Aljammal
|
2952fd56ab
|
Done Active Medications Service
|
5 years ago |
Amjad amireh
|
c2cfea7360
|
Contact us
|
5 years ago |
|
haroon amjad
|
5400d534db
|
updates for push notifications
|
5 years ago |
|
Mohammad Aljammal
|
b0f0b87345
|
fix merge issues
|
5 years ago |
|
Mohammad Aljammal
|
68466c8d03
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/localized_values.dart
lib/core/service/client/base_app_client.dart
lib/models/Appointments/DoctorListResponse.dart
lib/pages/BookAppointment/widgets/DoctorView.dart
lib/pages/MyAppointments/MyAppointments.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
|
5 years ago |
|
Mohammad Aljammal
|
fe66ee5993
|
fix lab result issues
|
5 years ago |
|
Mohammad Aljammal
|
02ce04a397
|
medical_profile_page.dart
|
5 years ago |
|
Mohammad Aljammal
|
1b3a780a29
|
add ar lan for medical profile
|
5 years ago |
|
haroon amjad
|
13adb46319
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/config/shared_pref_kay.dart
|
5 years ago |
|
Mohammad Aljammal
|
54b766de81
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/config/shared_pref_kay.dart
lib/uitl/translations_delegate_base.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
|
Mohammad Aljammal
|
01a011a03d
|
done dashboard page
|
5 years ago |
|
haroon amjad
|
96b7d00b4b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
5 years ago |
|
haroon amjad
|
30e08b4417
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/pages/login/login.dart
|
5 years ago |
|
haroon amjad
|
7a8392a97e
|
updates
|
5 years ago |
|
Sultan Khan
|
8516f7de1b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
|
Mohammad Aljammal
|
30c0963063
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into dashboard
Conflicts:
lib/config/localized_values.dart
lib/locator.dart
lib/pages/landing/home_page.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
|
Mohammad Aljammal
|
8989fbc9b7
|
done design dashboard
|
5 years ago |
|
haroon amjad
|
61dba06236
|
Twilio implemented in LiveCare
|
5 years ago |
|
haroon amjad
|
cc4f5c0615
|
updates
|
5 years ago |
|
haroon amjad
|
5f1413a2ac
|
implementing Twilio in LiveCare
|
5 years ago |
|
haroon amjad
|
db30fbdfd2
|
implementing livecare
|
5 years ago |
|
Sultan Khan
|
47c42808fd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
|
Sultan Khan
|
913729fc58
|
speech search
|
5 years ago |
|
Sultan Khan
|
3b2f9251dc
|
search
|
5 years ago |
|
haroon amjad
|
7972d01dff
|
Insurance Approval implemented
|
5 years ago |
|
Mohammad Aljammal
|
125360ced7
|
fix merge issues
|
5 years ago |
|
Mohammad Aljammal
|
002efe3b45
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/pages/landing/landing_page.dart
|
5 years ago |
|
Mohammad Aljammal
|
cfd5b2ccff
|
feedback Service done
|
5 years ago |
|
Sultan Khan
|
8e3fb6831d
|
registration changes
|
5 years ago |
|
Sultan Khan
|
9d0a2e1e43
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
|
Sultan Khan
|
41b438fd74
|
login page changes
|
5 years ago |
|
Mohammad Aljammal
|
ec09721869
|
fix merge issues
|
5 years ago |
|
Mohammad Aljammal
|
5874f4ba21
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/pages/landing/landing_page.dart
|
5 years ago |
|
Sultan Khan
|
3a15c16883
|
login changes
|
5 years ago |
|
Mohammad Aljammal
|
8de50bfe74
|
medical - my doctor and prescription services and pages
|
5 years ago |
|
Sultan Khan
|
31fe444150
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
5 years ago |
|
Sultan Khan
|
76aeeffad7
|
login page changes
|
5 years ago |
|
Mohammad Aljammal
|
93bfcbc20f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/pages/landing/landing_page.dart
pubspec.yaml
|
5 years ago |
|
Mohammad Aljammal
|
e147787be9
|
merge search and return medicine
|
5 years ago |
|
Mohammad Aljammal
|
01b230accf
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into SearchMedicineAndReturnMedicineList
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/main.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
pubspec.yaml
|
5 years ago |
|
Mohammad Aljammal
|
4bc68c6afd
|
merge sultan
|
5 years ago |
|
Mohammad Aljammal
|
2d5b725818
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_merge
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/pages/landing/landing_page.dart
lib/uitl/translations_delegate_base.dart
|
5 years ago |
|
Mohammad Aljammal
|
b2875fbce3
|
merge haroun
|
5 years ago |
hussam al-habibeh
|
31d2816e64
|
design for search medicine and return medicine list
|
5 years ago |
|
Mohammad Aljammal
|
3a68e0e092
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into merge_haron
Conflicts:
lib/config/config.dart
lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
|
Sultan Khan
|
5a08cb720c
|
login changes
|
5 years ago |
|
Mohammad Aljammal
|
fc749de77e
|
create doctor card and medical page
|
5 years ago |
|
Sultan Khan
|
f8d8e1c685
|
new pages added
|
5 years ago |
|
Sultan Khan
|
192b21a7e7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
# Conflicts:
# lib/main.dart
# lib/widgets/input/date_picker/button_actions.dart
# lib/widgets/input/text_field.dart
# lib/widgets/others/app_scaffold_widget.dart
|
5 years ago |
|
Mohammad Aljammal
|
257cc92691
|
add MVVM and di Mohammad Aljammal and Elham Rababah
|
5 years ago |