Commit Graph

22 Commits (7919d40f65c61c15a477eeddf6385e0d959bf849)

Author SHA1 Message Date
haroon amjad d794787459 updates 10 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
10 months ago
faizatflutter db50bd8f23 Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/api_consts.dart
#	lib/core/app_state.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/login.dart
#	lib/presentation/authentication/register.dart
#	lib/widgets/bottomsheet/generic_bottom_sheet.dart
#	lib/widgets/input_widget.dart
10 months ago
Sikander Saleem d385d0362f merge changes 10 months ago
faizatflutter 84804a59a7 completed till otp receiving 10 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
10 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
10 months ago
Sultan khan 2f2a8f3f8f search lab result screen added 10 months ago
haroon amjad efb22aec4e prescription details page implemented 10 months ago
faizatflutter 6e05ca15cf adding the login function 10 months ago
faizatflutter 32fadb8ad9 completed login function 10 months ago
aamir-csol d1e1154bdb changes 10 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
10 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 10 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 10 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 10 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
10 months ago
Sultan khan d3aff9f93d updating structure 10 months ago
Haroon Amjad 30fd99d122 android fixes 10 months ago
aamir-csol 4e3ba99280 widgets & fixes 10 months ago
Haroon Amjad c65d44ae4d updates 10 months ago
Haroon Amjad b6766654e0 initial commit 10 months ago