Commit Graph

60 Commits (cf7291e37905ad5c39cacd2e6a88251c593094d4)

Author SHA1 Message Date
Sultan Khan 18f35a22bb FAMILY FILE 4 years ago
Sultan Khan 5a9ab457e5 family files 4 years ago
Sultan Khan 4780039cc7 family file change 4 years ago
Sultan Khan 448a3aaa48 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan 881644a22e family files changes 4 years ago
Sultan khan f5b17444fe Merge branch 'sultan_new_design' into 'development_new_design_2.0'
my family

See merge request Cloud_Solution/diplomatic-quarter!441
4 years ago
Sultan Khan a39658206d my family 4 years ago
haroon amjad 40cbca565a fixes 4 years ago
Sultan Khan e3a7c08e7c blood type changes 4 years ago
Sultan Khan 3b4e03c618 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan b5cd6afa4b family file fixs 4 years ago
haroon amjad 3f3ddd7af0 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/MyAppointments/SchedulePage.dart
4 years ago
Sultan Khan 02f5b43b64 Merge branch 'development_new_design_2.0' of https://gitlab.com/Cloud_Solution/diplomatic-quarter into sultan_new_design 4 years ago
Sultan Khan ca70926050 family file fixes 4 years ago
Mirza.Shafique d48a4ff4e3 Back Button on Landing Page 4 years ago
Haroon Amjad 1fa6a4409b Family files fixes 4 years ago
Sultan Khan 9010558dc9 family files changes 4 years ago
haroon amjad 829fcd1461 Merge branch 'development_new_design_2.0' into haroon-new-design
# Conflicts:
#	lib/pages/ErService/rapid-response-team/rrt-order-list-item.dart
4 years ago
Sultan Khan 2c1d7c511e family file changes 4 years ago
haroon amjad 01ca8b8f84 updates & fixes 4 years ago
Sultan Khan 76e16594ba FAMILY FILES 4 years ago
Sultan Khan a57facb876 family file fix 4 years ago
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
5 years ago
Sultan Khan e5fb16ad69 langauge issue 5 years ago
Sikander Saleem 889ae24f07 merge changes-3 5 years ago
Sikander Saleem 473315f8a1 improvements 5 years ago
Sikander Saleem 53e4815866 no auth ui modifications 5 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