Commit Graph

38 Commits (9b33745a57ae419be948130ba1bf7e26713dd1aa)

Author SHA1 Message Date
aamir-csol 1b652f877d Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
#	lib/widgets/chip/app_custom_chip_widget.dart
1 month ago
aamir-csol 192d617350 family screen & widgets 1 month ago
aamir-csol e5f4da4e16 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
Sultan khan 3d1d78ba48 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan 1 month ago
Sultan khan 8f8c4c7f65 Merge branch 'master' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
haroon amjad 836a72ec22 App directionality changes 1 month ago
Haroon Amjad 1c2564a1e2 updates 1 month ago
haroon amjad 6048b3b5f1 Advance payment module implementation contd. 1 month ago
aamir-csol a79dcad221 family screen & widgets 1 month ago
Sultan khan 4d52987c83 Merge branch 'dev_aamir' of http://34.17.52.180/Haroon6138/HMG_Patient_App_New into dev_sultan
# Conflicts:
#	lib/core/api_consts.dart
#	lib/presentation/medical_file/medical_file_page.dart
1 month ago
Haroon Amjad c9206f1ab8 Radiology report implemented 1 month ago
haroon amjad 3b5d2d27a4 Updates 1 month ago
Sultan khan eafb52ab86 family file work in-progress 1 month ago
haroon amjad 5de5fc8be9 updates 2 months ago
haroon amjad 9f95150a94 book appointment implementation completed. 2 months ago
haroon amjad 3066bc8ea3 Book appointment implementation contd. 2 months ago
Haroon Amjad 7b94199d58 Medical report implementation done, Book Appointment implementation contd. 2 months ago
Haroon Amjad 14725616c6 medical report implementation contd. 2 months ago
Haroon Amjad de717edfe8 Sickleave implementation done. 2 months ago
Haroon Amjad b240293064 medical file implementation contd. 2 months ago
haroon amjad 151351c0bf medical file updates 2 months ago
Haroon Amjad 5620cc4442 medical file implementation contd. 2 months ago
haroon amjad e37eb78f81 my appointments changes implementation contd. 2 months ago
Haroon Amjad 003a161b52 custom chips implemented 2 months ago
haroon amjad a0bdc34685 My appointments implementation contd. 2 months ago
haroon amjad bafeb68950 medical file changes 2 months ago
Sikander Saleem d385d0362f merge changes 2 months ago
Sikander Saleem 6473ccecb5 Merge branch 'refs/heads/master' into dev_sikander
# Conflicts:
#	lib/core/app_assets.dart
2 months ago
aamir-csol da035650c0 Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/extensions/string_extensions.dart
#	lib/generated/locale_keys.g.dart
2 months ago
haroon amjad e8cc6407b6 Insurance update implementation contd. 2 months ago
Sikander Saleem ac0b7bec44 custom tab bar added in medical file section. 2 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
2 months ago
haroon amjad e044fc8c5e lab implementation contd. 2 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 2 months ago
aamir-csol d1e1154bdb changes 2 months ago
haroon amjad 9b1c3fe920 medical file updates 2 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 2 months ago
Haroon Amjad 0a39a00df5 Landing page updates 2 months ago