Commit Graph

510 Commits (072e6cffef6a8ff8529305317b448d03c966333c)

Author SHA1 Message Date
Sultan Khan 58b1f648c1 setting theme 5 years ago
Sultan Khan 283473a06a theme changes 5 years ago
Sultan Khan d1336eec8b login type 5 years ago
Sultan Khan c00391d3e5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
haroon amjad 9096ccd4d4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Mohammad Aljmma d76b679a7f fix issues 5 years ago
Mohammad Aljmma 6181e52ef1 fix authenticated user data 5 years ago
Sultan Khan f05b235cd0 login issue 5 years ago
haroon amjad 2e484d7535 QR Code loading issue resolved 5 years ago
Sultan Khan cced69502a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
haroon amjad 6062716209 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
haroon amjad 10efccbce8 my appointment fixes 5 years ago
Sultan Khan aec2ab75d0 settings update 5 years ago
Sultan Khan aa8f9f18e1 forgot password 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 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 Aljmma 6a83538544 add info for Medical 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 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
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 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 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
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 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
Elham Rababah 9f2beceb22 First step from notifications_page 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 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
haroon amjad af780bca76 registration fixes 5 years ago
haroon amjad dbb53e7821 fixed forgot password issue, Implemented new loader in login flow 5 years ago
Mohammad Aljmma 59d592778b Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page 5 years ago
Mohammad Aljmma e7e32a414b fix barcode 5 years ago
Mohammad Aljammal 1775766a08 Merge branch 'loader_fix' into 'diplomatic-quarter-live'
Fix loader issue.

See merge request Cloud_Solution/diplomatic-quarter!90
5 years ago
Elham Rababah fa88e9055f make loader center 5 years ago
Elham Rababah 042de21831 Fix loader issue. 5 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
5 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
5 years ago
Mohammad Aljmma 479aea4df8 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into home_page
 Conflicts:
	lib/uitl/translations_delegate_base.dart
5 years ago
Mohammad Aljmma d4be20b07b add icons 5 years ago
Mohammad Aljmma e10a0a4d54 add splash page fix language issues 5 years ago
haroon amjad 1553e71e7d New loading dialog added into appointment flow 5 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
5 years ago
Mohammad Aljmma 856ab52439 fix ui issues 5 years ago
haroon amjad 6fd7a3fa3d updates 5 years ago
Mohammad Aljmma 89cfcd3cad fix design issues 5 years ago
Mohammad Aljmma 0b90d3c687 fix issues 5 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
5 years ago
Mohammad Aljmma 874de15040 change the home page design 5 years ago
Mohammad Aljammal 94c25d2188 Merge branch 'loader' into 'diplomatic-quarter-live'
Loader

See merge request Cloud_Solution/diplomatic-quarter!84
5 years ago
Elham Rababah 6f5b5ed0c2 move gif loader utils 5 years ago
Elham Rababah bf412e1edf Finish loader as Gif image in all cases where the network is busy 5 years ago
haroon amjad d5118bda11 Login / Register UI fixes 5 years ago
Elham Rababah cd7c354458 loader first step 5 years ago
haroon amjad 3354058738 Branding updated according to DQ 5 years ago
haroon amjad 3ae6df1dcb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-live 5 years ago
haroon amjad 6a630f6d33 logo & colors changed for login & registration flow 5 years ago
Sultan Khan deb828b4dd Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 5 years ago
Sultan Khan 23b48485ed voice command 5 years ago
Mohammad Aljmma 1cf4797d4f add font 5 years ago
Mohammad Aljmma 26cf849f2b hot fixing 5 years ago
Mohammad Aljammal 50dffe9af9 Merge branch 'Haroon' into 'master'
Haroon

See merge request Cloud_Solution/diplomatic-quarter!74
5 years ago
Mohammad Aljmma d0ed776ff6 new home health service 5 years ago
haroon amjad dfa7e0e02f updates & fixes 5 years ago
haroon amjad 0b6cd845f1 implementing Smart Watch Integration 5 years ago
haroon amjad 22ef24c4ff Merge branch 'master' into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
5 years ago
jammal 9328f942ba done ER service 5 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
5 years ago
jammal bd2254491c done ER service 5 years ago
jammal 57f938aa09 fix ios issues 5 years ago
jammal 0fceca8f3e fix ios issues 5 years ago
haroon amjad 68b0e3857a updates 5 years ago
Sultan Khan f03a711dff symptom checker gender page updated 5 years ago
haroon amjad 6b316bf262 Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into Haroon
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	lib/config/config.dart
#	lib/pages/AlHabibMedicalService/​ health_calculators.dart
#	lib/pages/BookAppointment/widgets/DoctorView.dart
#	lib/pages/ContactUs/LiveChat/hospitalsLivechat_page.dart
5 years ago
haroon amjad 7edb6fd179 UI Fixes in LiveCare 5 years ago
Mohammad Aljammal e025321c71 fix issues 5 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
5 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
5 years ago