haroon amjad
|
15a8e64e7c
|
updates & fixes
|
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 |
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 |
|
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 |
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 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
|
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
|
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 |
|
Elham Rababah
|
cd7c354458
|
loader first step
|
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 |
|
Sultan Khan
|
23b48485ed
|
voice command
|
4 years ago |
|
Mohammad Aljmma
|
1cf4797d4f
|
add font
|
4 years ago |
|
Mohammad Aljmma
|
d0ed776ff6
|
new home health service
|
4 years ago |
|
jammal
|
9328f942ba
|
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 |
|
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 |
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
|
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 |
|
Sultan Khan
|
d0d262f139
|
robot icon updates
|
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 |
Amjad amireh
|
83735ab68d
|
modified Child vaccintion note
|
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 |
|
Sultan Khan
|
7b6135a6c7
|
voice search
|
4 years ago |
|
Sultan Khan
|
8f18d1025a
|
voice search
|
4 years ago |
|
Sultan Khan
|
227731f8f8
|
Merge
|
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 |
|
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 |
|
haroon amjad
|
929e289a6f
|
started implementing Covid-19 DriveThru Test Module
|
4 years ago |
|
Elham Rababah
|
dd76ae05a7
|
fix H2O page issue
|
4 years ago |
|
Amjad amireh
|
675d544514
|
Blood Denote
|
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
|
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 |
|
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
|
b853bede68
|
first step from h2o
|
4 years ago |
|
Mohammad Aljammal
|
82c2577d36
|
Done ask doctor service
|
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 |
|
Elham Rababah
|
1e3ff89dbd
|
finish new e-referral except calling the service
|
4 years ago |
|
hussam al-habibeh
|
3c5adc0a1d
|
HMG Service layout
|
4 years ago |
|
Mohammad Aljammal
|
9f06ce7d1d
|
done EyeMeasurements service
|
4 years ago |
|
Mohammad Aljammal
|
c01e6095f2
|
done my trackers
|
4 years ago |
|
Elham Rababah
|
f1f3b6bd56
|
first step from e-referral
|
4 years ago |
|
Mohammad Aljammal
|
a0300738e8
|
done My balance
|
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 |
|
Mohammad Aljammal
|
11f9daa3ff
|
add PatientSickLeave
|
4 years ago |
|
Sultan Khan
|
5e252d21d2
|
voice search added more medical option
|
4 years ago |
|
Sultan Khan
|
f5d6864291
|
voice search coc
|
4 years ago |
|
Sultan Khan
|
5d34398998
|
insurance updated
|
4 years ago |
|
Sultan Khan
|
a535543863
|
more pages added on the voice search
|
4 years ago |
|
Sultan Khan
|
7908506d5f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Mohammad Aljammal
|
153335538a
|
done monthly reports
|
4 years ago |
|
Sultan Khan
|
a98bc226e6
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
0f63b922d1
|
speech to text
|
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 |
|
Sultan Khan
|
f6a3f0e615
|
family file
|
4 years ago |
|
haroon amjad
|
ce9903fd13
|
nearest appointment flow implemented
|
4 years ago |
|
Sultan Khan
|
20a17c0070
|
clinic search
|
4 years ago |
|
Sultan Khan
|
4a75215a19
|
search
|
4 years ago |
|
Sultan Khan
|
3a4c016f4e
|
search
|
4 years ago |
|
Sultan Khan
|
badb4e52df
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
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
|
01a011a03d
|
done dashboard page
|
4 years ago |
|
Sultan Khan
|
e7a3d1a4ab
|
speech search
|
4 years ago |
|
Sultan Khan
|
f1e0bcf86e
|
speech to tex
|
4 years ago |
|
Sultan Khan
|
3247378c02
|
search
|
4 years ago |
|
Mohammad Aljammal
|
895c09efa4
|
parking service
|
4 years ago |
|
Sultan Khan
|
5d112b5464
|
merge
|
4 years ago |
|
Sultan Khan
|
8516f7de1b
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
9b55309d53
|
text to speech
|
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 |
|
Sultan Khan
|
2f9885ecf8
|
family file changes
|
4 years ago |
|
Sultan Khan
|
8887ba85fe
|
family file
|
4 years ago |
|
haroon amjad
|
732ab90b2f
|
Book Appointment check login
|
4 years ago |
|
Sultan Khan
|
cb99b2a7a7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
327c4585a6
|
family file change
|
4 years ago |
|
Mohammad Aljammal
|
9cf5c80aae
|
add time line and appointment rate
|
4 years ago |
|
Mohammad Aljammal
|
f5b16734c6
|
add time line
|
4 years ago |
|
Mohammad Aljammal
|
8495260c5a
|
fix issues in feedback
|
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 |
|
Mohammad Aljammal
|
2b0e35a907
|
fix issues in base app client
|
4 years ago |
|
haroon amjad
|
73cf37a3a5
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/core/service/client/base_app_client.dart
|
4 years ago |
|
haroon amjad
|
b9d913e6a5
|
Merge fixes & updates
|
4 years ago |
|
Sultan Khan
|
03b34115c4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
3b2f9251dc
|
search
|
4 years ago |
|
Sultan Khan
|
4c1a8dc38f
|
new changes
|
4 years ago |
|
haroon amjad
|
fde47a5c2c
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/core/service/client/base_app_client.dart
|
4 years ago |
|
haroon amjad
|
750746aabe
|
updates & fixes
|
4 years ago |
|
Mohammad Aljammal
|
d093ecd5e6
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
Conflicts:
ios/Podfile
ios/Runner.xcodeproj/project.pbxproj
lib/config/config.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
b4b33be3e9
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
Conflicts:
lib/core/service/client/base_app_client.dart
|
4 years ago |
|
Mohammad Aljammal
|
37b874fe3f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into vital_sign
Conflicts:
lib/config/localized_values.dart
lib/uitl/translations_delegate_base.dart
|
4 years ago |
|
Mohammad Aljammal
|
a1fa2c0727
|
done vital sign
|
4 years ago |
|
Sultan Khan
|
da6f238c89
|
family files changes
|
4 years ago |
|
Sultan Khan
|
621870eca1
|
family file changes
|
4 years ago |
|
haroon amjad
|
7d0efda1c4
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/pages/landing/landing_page.dart
# lib/pages/login/confirm-login.dart
# lib/pages/medical/medical_profile_page.dart
# lib/services/authentication/auth_provider.dart
# lib/uitl/translations_delegate_base.dart
# pubspec.yaml
|
4 years ago |
Haroon Amjad
|
8ad2941836
|
Appointment payment finalised, Ask Doc implemeted & other updates
|
4 years ago |
|
haroon amjad
|
3a9fa97c91
|
updates
|
4 years ago |
|
Sultan Khan
|
d1871bb71f
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
8ee3b3b557
|
family files.
|
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
|
5ea0df9f1e
|
Merge remote-tracking branch 'origin/sultan' into sultan
# Conflicts:
# lib/uitl/date_uitl.dart
|
4 years ago |
|
Mohammad Aljammal
|
cfd5b2ccff
|
feedback Service done
|
4 years ago |
|
Sultan Khan
|
e735855c33
|
registration done.
|
4 years ago |
|
haroon amjad
|
28fde5c500
|
My Appointments implemented, Appointment Details functionality updated, Logged In User details added in APIs & other updates
|
4 years ago |
|
Mohammad Aljammal
|
05222207da
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into medical_profile
Conflicts:
lib/config/config.dart
lib/core/service/client/base_app_client.dart
|
4 years ago |
|
Mohammad Aljammal
|
a12197fe70
|
labs result done add some file to git ignore for ios
|
4 years ago |
|
haroon amjad
|
00d9214460
|
Merge branch 'sultan' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/localized_values.dart
# lib/core/service/client/base_app_client.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
Sultan Khan
|
0bc529f420
|
login changes
|
4 years ago |
|
haroon amjad
|
192a3835d6
|
implemented payment method selection & payment details dialog. Added Calendar events to add remindar in calendar for appointment.
|
4 years ago |
|
Mohammad Aljammal
|
1bbbd18373
|
labs services
|
4 years ago |
|
Sultan Khan
|
9d0a2e1e43
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
8d0834ff3e
|
login inprogress
|
4 years ago |
|
Mohammad Aljammal
|
940b327561
|
done Prescriptions
|
4 years ago |
|
Sultan Khan
|
41b438fd74
|
login page changes
|
4 years ago |
|
haroon amjad
|
0171664779
|
Master Merged in to local
|
4 years ago |
|
haroon amjad
|
049d455e3c
|
Implementing appointment details functions
|
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 |
|
haroon amjad
|
f5ddfabf50
|
Todo list implemented, Appointment details implemented, Appointment Reschedule implemented, Appointment Confirmed implemented
|
4 years ago |
|
hussam al-habibeh
|
e92cb2e1ac
|
Design and return Pharmacy List
|
4 years ago |
|
haroon amjad
|
7f4fbadfab
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
# lib/pages/landing/landing_page.dart
|
4 years ago |
|
haroon amjad
|
d8fe501341
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
# lib/config/config.dart
# lib/pages/BookAppointment/BookingOptions.dart
# lib/services/appointment_services/GetDoctorsList.dart
# lib/uitl/translations_delegate_base.dart
# lib/widgets/others/app_scaffold_widget.dart
|
4 years ago |
|
Sultan Khan
|
31fe444150
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan
|
4 years ago |
|
Sultan Khan
|
b0989d6ca0
|
login pages changes
|
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
|
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 |
|
haroon amjad
|
e34da6485b
|
Doctor Free Slots implemented
|
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 |
|
Sultan Khan
|
8dd38a8b3c
|
no message
|
4 years ago |
|
haroon amjad
|
a0173c5b4d
|
Appointment Details page, ToDo List Page implemented
|
4 years ago |
|
Mohammad Aljammal
|
257cc92691
|
add MVVM and di Mohammad Aljammal and Elham Rababah
|
4 years ago |
|
haroon amjad
|
1554a6bdf5
|
Book Appointment Flow added
|
4 years ago |
|
Sultan Khan
|
d897463b42
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter
|
4 years ago |
|
Sultan Khan
|
4a0cc17069
|
login module started
|
4 years ago |
|
Mohammad Aljammal
|
198a1854a9
|
add documentation Mohammad Aljammal and Elham Rababah
|
4 years ago |
|
Mohammad Aljammal
|
6d6c71655a
|
add new widget by Elham Rababah and Mohammad Aljammal
|
4 years ago |
|
Mohammad Aljammal
|
19676549e1
|
add base client, landing page, bottom_nav_bar , List Container, List Item, drawer progress indicator and asset file
|
4 years ago |
|
Mohammad Aljammal
|
3ed5c3878f
|
init project structure By Mohammad and Elham
|
4 years ago |