Haroon Amjad
|
81b51bef51
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
4 years ago |
Mohammad Aljammal
|
4e823c2be4
|
fix chart and duplicated data in Patient Lab Result
|
4 years ago |
haroon amjad
|
051bd1e23f
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
|
4 years ago |
Zohaib Kambrani
|
8457972fda
|
no message
|
4 years ago |
haroon amjad
|
951d9b553f
|
fixes & updates
|
4 years ago |
Zohaib Kambrani
|
92ba977fca
|
no message
|
4 years ago |
Sultan Khan
|
557b8e814f
|
voice command
|
4 years ago |
haroon amjad
|
75de755ccd
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/pages/paymentService/payment_service.dart
# lib/uitl/translations_delegate_base.dart
|
4 years ago |
Zohaib Kambrani
|
8d5d55a150
|
Geofencing in progress
|
4 years ago |
Mohammad Aljammal
|
a2ec01be5d
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into hot_fix
Conflicts:
lib/config/localized_values.dart
lib/pages/landing/home_page.dart
lib/pages/medical/radiology/radiology_details_page.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
Mohammad Aljammal
|
5083080ba3
|
fix vital sign details
|
4 years ago |
haroon amjad
|
1db5b15dcd
|
Merge branch 'diplomatic-quarter-live' into diplomatic-quarter-haroon
|
4 years ago |
haroon amjad
|
9ecaaa1b12
|
radiology fix in appointment details
|
4 years ago |
Sultan Khan
|
9d9d77ee3a
|
bug fixes
|
4 years ago |
Sultan Khan
|
c813deea29
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
188b72bb90
|
voice command
|
4 years ago |
Sultan Khan
|
e28209d4e8
|
bug fixes
|
4 years ago |
Mohammad Aljammal
|
9cec304712
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
bug fixes
See merge request Cloud_Solution/diplomatic-quarter!168
|
4 years ago |
Sultan Khan
|
21ccf1ef86
|
bug fixes
|
4 years ago |
Sultan Khan
|
ce7a64e86e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
haroon amjad
|
33956db22a
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
|
4 years ago |
Mohammad Aljammal
|
9dfd8a71dc
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into privileges
Conflicts:
lib/locator.dart
lib/pages/DrawerPages/family/my-family.dart
lib/pages/login/confirm-login.dart
lib/pages/medical/medical_profile_page.dart
lib/pages/medical/reports/report_home_page.dart
lib/widgets/bottom_navigation/bottom_nav_bar.dart
lib/widgets/drawer/app_drawer_widget.dart
|
4 years ago |
Sultan Khan
|
7f44677242
|
voice command priv
|
4 years ago |
Mohammad Aljammal
|
935e72975c
|
add new privilege
|
4 years ago |
Sultan Khan
|
542335364e
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
Sultan Khan
|
c050c3f189
|
voice command updated
|
4 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
|
4 years ago |
Fatimah Alshammari
|
ed68eed9df
|
added links for profile
|
4 years ago |
Mohammad Aljammal
|
2e2a29145c
|
fix merge issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
77dcb918c3
|
Revert "Merge branch 'pharmacy-hussam' into 'master'"
This reverts merge request !149
|
4 years ago |
Sultan Khan
|
af1c59394c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
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 |
Sultan Khan
|
8c5746f7b1
|
bug fixes
|
4 years ago |
hussam al-habibeh
|
64cbae3602
|
Search
|
4 years ago |
Sultan Khan
|
81c8239412
|
bug fixes
|
4 years ago |
mosazaid
|
35d0d3e441
|
finsi lakum points task
|
4 years ago |
Mohammad Aljammal
|
dc898a799d
|
Add Privileges
|
4 years ago |
haroon amjad
|
ff0d66ccdb
|
Covid test translations
|
4 years ago |
Zohaib Kambrani
|
1155466d19
|
Packages and Offer Slider at home
|
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 |
Sultan Khan
|
8de838a6dc
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp
|
4 years ago |
Zohaib Kambrani
|
27182ee8db
|
no message
|
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
|
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 |
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 |
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 |
Mohammad Aljammal
|
2731c5b1d4
|
Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan
See merge request Cloud_Solution/diplomatic-quarter!127
|
4 years ago |
Sultan Khan
|
7c33c06c0c
|
fingerprint
|
4 years ago |
Mohammad Aljammal
|
0ac599ea1c
|
fix vital Sign
|
4 years ago |
haroon amjad
|
21c7c94ef2
|
updates & fixes
|
4 years ago |
Sultan Khan
|
8d499704dc
|
family file changes
|
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 |
Sultan Khan
|
2f454055b9
|
login fixed
|
4 years ago |
Sultan Khan
|
6e152951b4
|
notification count
|
4 years ago |
Sultan Khan
|
00b0154987
|
my family
|
4 years ago |
Sultan Khan
|
fdef34a394
|
viral sign issue
|
4 years ago |
Zohaib Kambrani
|
69d1e4bb0b
|
no message
|
4 years ago |
Sultan Khan
|
1eb6516ea6
|
Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljmma
|
741126102d
|
fix issue #11
|
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 |
Sultan Khan
|
283473a06a
|
theme changes
|
4 years ago |
Zohaib Kambrani
|
0c71fbad5f
|
no message
|
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 |
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 |
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
|
570aa514cd
|
fix user authentication data
|
4 years ago |
haroon amjad
|
ee67852970
|
Bottom navbar count & ToDo list fixed
|
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 |
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 |
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 |
Mohammad Aljmma
|
e42f953bd1
|
fix prescription report issues
|
4 years ago |
haroon amjad
|
ff3368eefb
|
Login check implemented for appointment & ToDo
|
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 |
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
|
d4be20b07b
|
add icons
|
4 years ago |
Mohammad Aljmma
|
e10a0a4d54
|
add splash page fix language issues
|
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
|
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
|
874de15040
|
change the home page design
|
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 |
Fatimah Alshammari
|
1e00b9a4d8
|
added my-profile
|
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 |
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
|
068382e76f
|
add call for backend service
|
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
|
53bbafdc2b
|
fix Authenticated User Object
|
4 years ago |
Sultan Khan
|
3ad928902b
|
voice command
|
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 |
Elham Rababah
|
31b217aa19
|
First step from CMC
|
4 years ago |
Sultan Khan
|
227731f8f8
|
Merge
|
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 |
Sultan Khan
|
5c859034d6
|
voice search
|
4 years ago |
Mohammad Aljammal
|
f543126152
|
Ambulance Service
|
4 years ago |
haroon amjad
|
929e289a6f
|
started implementing Covid-19 DriveThru Test Module
|
4 years ago |
haroon amjad
|
7fdc0da9dc
|
livecare scheduling implemented
|
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 |
Sultan Khan
|
03ff56f2de
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
591e9e9a4c
|
updated
|
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 |
hussam al-habibeh
|
3c5adc0a1d
|
HMG Service layout
|
4 years ago |
Amjad amireh
|
c2cfea7360
|
Contact us
|
4 years ago |
Amjad amireh
|
c2b7507005
|
Contact us
|
4 years ago |
haroon amjad
|
478917b240
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
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 |
Sultan Khan
|
0a2cb22042
|
design issues fixed
|
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
|
9159928e27
|
edit on vaccine service
|
4 years ago |
Mohammad Aljammal
|
b0f0b87345
|
fix merge issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
fe66ee5993
|
fix lab result issues
|
4 years ago |
Mohammad Aljammal
|
02ce04a397
|
medical_profile_page.dart
|
4 years ago |
Mohammad Aljammal
|
1b3a780a29
|
add ar lan for medical profile
|
4 years ago |
Mohammad Aljammal
|
4ffbb80f3d
|
ER
|
4 years ago |
Mohammad Aljammal
|
ef4a57223c
|
fix DoctorView.dart UI issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
91e5a20fd0
|
fix merge issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
d16ea676cf
|
done parking service ,fix design issues in home page and add new icon
|
4 years ago |
Mohammad Aljammal
|
01a011a03d
|
done dashboard page
|
4 years ago |
haroon amjad
|
96b7d00b4b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
|
4 years ago |
haroon amjad
|
30e08b4417
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/pages/login/login.dart
|
4 years ago |
haroon amjad
|
7a8392a97e
|
updates
|
4 years ago |
Mohammad Aljammal
|
895c09efa4
|
parking service
|
4 years ago |
Sultan Khan
|
8516f7de1b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Mohammad Aljammal
|
4adc2916b4
|
fix merge issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
8989fbc9b7
|
done design dashboard
|
4 years ago |
haroon amjad
|
61dba06236
|
Twilio implemented in LiveCare
|
4 years ago |
haroon amjad
|
cc4f5c0615
|
updates
|
4 years ago |
haroon amjad
|
5f1413a2ac
|
implementing Twilio in LiveCare
|
4 years ago |
haroon amjad
|
db30fbdfd2
|
implementing livecare
|
4 years ago |
Sultan Khan
|
47c42808fd
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
913729fc58
|
speech search
|
4 years ago |
Sultan Khan
|
3b2f9251dc
|
search
|
4 years ago |
haroon amjad
|
7972d01dff
|
Insurance Approval implemented
|
4 years ago |
Mohammad Aljammal
|
125360ced7
|
fix merge issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
cfd5b2ccff
|
feedback Service done
|
4 years ago |
Sultan Khan
|
8e3fb6831d
|
registration changes
|
4 years ago |
Sultan Khan
|
9d0a2e1e43
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
41b438fd74
|
login page changes
|
4 years ago |
Mohammad Aljammal
|
ec09721869
|
fix merge issues
|
4 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
|
4 years ago |
Mohammad Aljammal
|
1ac420ef7c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
Conflicts:
lib/config/config.dart
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
Sultan Khan
|
3a15c16883
|
login changes
|
4 years ago |
Mohammad Aljammal
|
43349542da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
|
4 years ago |
Mohammad Aljammal
|
8de50bfe74
|
medical - my doctor and prescription services and pages
|
4 years ago |
hussam al-habibeh
|
e92cb2e1ac
|
Design and return Pharmacy List
|
4 years ago |
Sultan Khan
|
31fe444150
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
Sultan Khan
|
76aeeffad7
|
login page changes
|
4 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
|
4 years ago |
Mohammad Aljammal
|
e147787be9
|
merge search and return medicine
|
4 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
|
4 years ago |
Mohammad Aljammal
|
4bc68c6afd
|
merge sultan
|
4 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
|
4 years ago |
Mohammad Aljammal
|
b2875fbce3
|
merge haroun
|
4 years ago |
hussam al-habibeh
|
31d2816e64
|
design for search medicine and return medicine list
|
4 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
|
4 years ago |
Sultan Khan
|
5a08cb720c
|
login changes
|
4 years ago |
Mohammad Aljammal
|
fc749de77e
|
create doctor card and medical page
|
4 years ago |
Sultan Khan
|
f8d8e1c685
|
new pages added
|
4 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
|
4 years ago |
Mohammad Aljammal
|
257cc92691
|
add MVVM and di Mohammad Aljammal and Elham Rababah
|
4 years ago |