Commit Graph

570 Commits (5f12eab870b82be5e91dcd360199c71916da7dba)

Author SHA1 Message Date
Sultan Khan 6bbdf05f90 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 857fc813cd button feedback 4 years ago
Sultan Khan 571bda9100 permission 4 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 4 years ago
Sultan Khan 8429f83d7c registration done 4 years ago
Sultan Khan 391e178484 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 8d499704dc family file changes 4 years ago
Mohammad Aljammal 91cada6901 fix Advance Payment 4 years ago
Mohammad Aljammal dcbc0de69f fix prescription 4 years ago
Mohammad Aljammal 67cc5e2033 fix Prescriptions 4 years ago
Sultan Khan 2f454055b9 login fixed 4 years ago
Sultan Khan 18a2393d92 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 6e152951b4 notification count 4 years ago
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
4 years ago
Sultan Khan d2f391ab7f setting page inprogress 4 years ago
Sultan Khan 4c8c4e3725 setting page inprogress 4 years ago
Sultan Khan 0ed29be214 launch 4 years ago
Sultan Khan 00b0154987 my family 4 years ago
Mohammad Aljammal 3c1257b379 fix Medicine Search 4 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 91be66ecdd family file changes 4 years ago
Mohammad Aljammal b785f87dac fix App drawer after logout 4 years ago
Mohammad Aljammal ddc7eca605 fix Insurance Cards 4 years ago
Mohammad Aljmma 6523a1dea9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into arabic_issues
 Conflicts:
	lib/config/localized_values.dart
4 years ago
Mohammad Aljmma 501692587f change the base Url 4 years ago
Mohammad Aljmma a9b11a6b03 fix lab result 4 years ago
Sultan Khan fdef34a394 viral sign issue 4 years ago
Sultan Khan 3589b21590 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Mohammad Aljmma 770d28033d fix issues#26 & 27 & 28 4 years ago
Mohammad Aljmma ed7b9d609f fix lab result 4 years ago
haroon amjad b81af62551 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	lib/config/localized_values.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad b89c1f03b3 language translation fixes 4 years ago
Sultan Khan 431306f0e1 insurance details 4 years ago
Sultan Khan 1f4f81b454 insurance card details 4 years ago
Sultan Khan bedafa24cd insurance details 4 years ago
Sultan Khan d81cc7119d insurance details 4 years ago
Mohammad Aljmma 8f38dc6077 fix issue #24 4 years ago
Sultan Khan a16145d7f1 bugfixes 4 years ago
Sultan Khan 0eedb788c3 register page 4 years ago
Sultan Khan 536682e953 merge 4 years ago
Sultan Khan 1eb6516ea6 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 3fef1b9d52 theme and login issues fixed 4 years ago
Mohammad Aljmma a1684bdd9e fix issue #17 & 18 4 years ago
Mohammad Aljmma e42ebfbf64 fix issue #16 4 years ago
Mohammad Aljmma 59defa4532 fix issue #15 4 years ago
Mohammad Aljmma 97a8fe4f9b fix issue #14 4 years ago
Mohammad Aljmma 5e8b61bf2d fix issue #13 4 years ago
Mohammad Aljmma 0f938fafd2 fix issue #12 4 years ago
Mohammad Aljmma 741126102d fix issue #11 4 years ago
Mohammad Aljmma fdeac4823e fix issue #10 4 years ago
Mohammad Aljmma 179df475b4 fix issue #9 4 years ago
Mohammad Aljmma 20ece68ddb fix issue # 6 & 7 & 8 4 years ago
Mohammad Aljmma 216c5609c6 fix issue # 6 & 7 & 8 4 years ago
Mohammad Aljmma b913e5a7b7 fix issue#6 4 years ago
Mohammad Aljmma 7b55454fde fix issue#5 4 years ago
Mohammad Aljmma a742f896be fix issue#4 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
Mohammad Aljmma e1f6ef5e5b fix Prescriptions history 4 years ago
Sultan Khan 58b1f648c1 setting theme 4 years ago
Sultan Khan 283473a06a theme changes 4 years ago
Sultan Khan d1336eec8b login type 4 years ago
Sultan Khan c00391d3e5 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
haroon amjad 9096ccd4d4 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
Mohammad Aljmma d76b679a7f fix issues 4 years ago
Mohammad Aljmma 6181e52ef1 fix authenticated user data 4 years ago
Sultan Khan f05b235cd0 login issue 4 years ago
haroon amjad 2e484d7535 QR Code loading issue resolved 4 years ago
Sultan Khan cced69502a Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
haroon amjad 6062716209 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad 10efccbce8 my appointment fixes 4 years ago
Sultan Khan aec2ab75d0 settings update 4 years ago
Sultan Khan aa8f9f18e1 forgot password 4 years ago
Mohammad Aljmma 981020fce5 fix my family issues 4 years ago
Mohammad Aljmma 1111f26a9d Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into my_family 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
Sultan Khan 4976870d2e Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 875bf10c73 settings page added 4 years ago
Mohammad Aljmma 6a83538544 add info for Medical 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 7d2f1cf318 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into fix_authentication 4 years ago
Mohammad Aljmma 570aa514cd fix user authentication data 4 years ago
haroon amjad b7b7ead3ba Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad ee67852970 Bottom navbar count & ToDo list fixed 4 years ago
haroon amjad f0897881d1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 4 years ago
haroon amjad d75e5caf08 fixed appointment online checkIn issue 4 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
4 years ago
Mohammad Aljmma 4a4d5248a2 fix status issue 4 years ago
Elham Rababah 64f970c40c Fix issues after the merge 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
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
4 years ago
haroon amjad 15a8e64e7c updates & fixes 4 years ago
Elham Rababah 41b919183f Fix bug on read notifications_page.dart 4 years ago
Mohammad Aljmma 9880b0236b fix my family issues 4 years ago
Sultan Khan 0443a37886 register page updated 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