Commit Graph

38 Commits (298a8f4cff624dd46bef9f118228e39159f9cf80)

Author SHA1 Message Date
Sultan Khan dd58b8637b bug fixs 4 years ago
Sikander Saleem 083d696c62 Merge branch 'development' into development_new_design_2.0
# Conflicts:
#	lib/config/localized_values.dart
#	lib/pages/landing/landing_page.dart
#	lib/pages/login/login.dart
#	lib/uitl/translations_delegate_base.dart
4 years ago
Sultan Khan e5fb16ad69 langauge issue 4 years ago
Sikander Saleem 889ae24f07 merge changes-3 4 years ago
Sikander Saleem 473315f8a1 improvements 4 years ago
Sikander Saleem 53e4815866 no auth ui modifications 4 years ago
Sultan Khan 8c9c309abb bug fixes 5 years ago
Sultan Khan 1b770420be bug fixes 5 years ago
Sultan Khan 80d96ba785 Privilege issue fixed 5 years ago
Sultan Khan d33918c932 Merge branch 'development' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Mohammad Aljammal d477481856 fix security issues in pharmacy 5 years ago
Sultan Khan c65983bfdb code merged 5 years ago
Mohammad Aljammal 298b4d6525 change color 5 years ago
Mohammad Aljammal 952e106531 return privilege 5 years ago
Sultan Khan c01246acf0 hot fix 5 years ago
Mohammad Aljammal 591d56e624 change the info images and change the out patient color 5 years ago
Sultan Khan 73c8e00852 bug fixes 5 years ago
Sultan Khan d53031b0e6 blood type update for family files 5 years ago
Mohammad Aljammal 9c12e949e8 hot fixes 5 years ago
Sultan Khan b759758a68 bug fixes 5 years ago
Mohammad Aljammal de1e352e98 fix charts and vital sign 5 years ago
Sultan Khan 1f0d01b6cc language issue fixed 5 years ago
Sultan Khan 2c50402aa8 language issue fixed 5 years ago
Sultan Khan ce7a64e86e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Mohammad Aljammal a1e92e1fdd fix merge issue 5 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
5 years ago
Sultan Khan 542335364e Merge branch 'master' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan-patientapp 5 years ago
Sultan Khan a3e01ff938 flutter tts 5 years ago
Sultan Khan 8c5746f7b1 bug fixes 5 years ago
Sultan Khan 81c8239412 bug fixes 5 years ago
Mohammad Aljammal dc898a799d Add Privileges 5 years ago
haroon amjad 92db2b2be9 Merge branch 'diplomatic-quarter-live' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into diplomatic-quarter-haroon 5 years ago
Sultan Khan 603833db37 login changes 5 years ago
Sultan Khan 8d499704dc family file changes 5 years ago
Sultan Khan 00b0154987 my family 5 years ago
Sultan Khan 91be66ecdd family file changes 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
Elham Rababah 9f2beceb22 First step from notifications_page 5 years ago