Commit Graph

16 Commits (2d5f2b1deb378b273ba83ace01f9c270e5137ddd)

Author SHA1 Message Date
Sikander Saleem d385d0362f merge changes 6 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
6 months ago
haroon amjad cce7c7166d Merge branch 'dev_sultan'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
6 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 6 months ago
haroon amjad efb22aec4e prescription details page implemented 6 months ago
aamir-csol d1e1154bdb changes 6 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
6 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 6 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 6 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 6 months ago
faizatflutter e2b0930dd1 Merge branch 'master' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/core/app_state.dart
#	lib/main.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/home/landing_page.dart
#	pubspec.yaml
6 months ago
Sultan khan d3aff9f93d updating structure 6 months ago
Haroon Amjad 30fd99d122 android fixes 6 months ago
aamir-csol 4e3ba99280 widgets & fixes 6 months ago
Haroon Amjad c65d44ae4d updates 6 months ago
Haroon Amjad b6766654e0 initial commit 6 months ago