Commit Graph

218 Commits (554ed1b50a4f4e020421d7807c427c4c0eba87ed)

Author SHA1 Message Date
haroon amjad dfa1952f4d Implemented countdown timer in ToDo list & removed Smart progress bar from the whole app 4 years ago
Sultan Khan f5b7d35f23 bug fixes 4 years ago
Sultan Khan 81c8239412 bug fixes 4 years ago
haroon amjad 47b030eb82 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon
# Conflicts:
#	ios/Flutter/.last_build_id
#	lib/config/config.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
haroon amjad 7edb0c8009 Doctor rating dialog revamped 4 years ago
Mohammad Aljammal 3daef6e53f add images info 4 years ago
Sultan Khan de2a5e55eb Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 4 years ago
Sultan Khan 7d3c1ac852 weather indicator updated 4 years ago
Sultan Khan 648d9d245d health weather indicator 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
Sultan Khan 340b9770c8 login 4 years ago
Mohammad Aljammal 0ac599ea1c fix vital Sign 4 years ago
haroon amjad d284ceac04 advance payment & payment flow issues fixed 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
Mohammad Aljammal 0966269537 Merge branch 'sultan' into 'diplomatic-quarter-live'
Sultan

See merge request Cloud_Solution/diplomatic-quarter!116
4 years ago
Sultan Khan 30a8e24521 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan 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 a9b11a6b03 fix lab result 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 1f4f81b454 insurance card details 4 years ago
Sultan Khan bedafa24cd insurance details 4 years ago
Mohammad Aljmma 8f38dc6077 fix issue #24 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 e1f6ef5e5b fix Prescriptions history 4 years ago
Sultan Khan d1336eec8b login type 4 years ago
Sultan Khan f05b235cd0 login issue 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 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 f0897881d1 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 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
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