Commit Graph

90 Commits (24362f67cbe92690d0c94e6ea1d5f56e0dccf761)

Author SHA1 Message Date
haroon amjad a0bdc34685 My appointments implementation contd. 2 months ago
Haroon Amjad 43fa08b8b6 insurance update update 2 months ago
haroon amjad d794787459 updates 2 months ago
faizatflutter 702c504d4e Merge branch 'refs/heads/master' into faiz_dev1
# Conflicts:
#	pubspec.yaml
2 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
2 months ago
faizatflutter 84804a59a7 completed till otp receiving 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
Sikander Saleem 85bb00a8fc Merge branch 'refs/heads/master' into dev_sikander 2 months ago
Sikander Saleem 38d37fd407 custom tab bar added. 2 months ago
faizatflutter 3e50a3c89d Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/core/enums.dart
#	lib/features/authentication/authentication_view_model.dart
#	lib/presentation/authentication/register.dart
#	lib/presentation/home/landing_page.dart
2 months ago
faizatflutter 6e05ca15cf adding the login function 2 months ago
aamir-csol cf1908b44a Merge branch 'master' into dev_aamir
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
2 months ago
aamir-csol 85fac13314 changes 2 months ago
Sultan khan 886825a4b9 bottom navigation updated. 2 months ago
faizatflutter 32fadb8ad9 completed login function 2 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 2 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 2 months ago
Sultan khan 0de09dd72c no message 2 months ago
aamir-csol 7321da67e3 register step 2 & fixes 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 a77fc49c68 lab result changes 2 months ago
haroon amjad e044fc8c5e lab implementation contd. 2 months ago
faizatflutter 488636a13f Merge branch 'dev_aamir' into faiz_dev1
# Conflicts:
#	lib/features/authentication/authentication_view_model.dart
2 months ago
faizatflutter 572fcef0f1 checkUserAuth 2 months ago
aamir-csol d1e1154bdb changes 2 months ago
aamir-csol 23a4035117 Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/main.dart
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
#	lib/widgets/buttons/custom_button.dart
2 months ago
faizatflutter c6a95fe7d7 latest push after master merged 2 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
2 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 2 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 2 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 2 months ago
faizatflutter 89e9323d9e merged master and updated structure 2 months ago
Haroon Amjad 0a39a00df5 Landing page updates 2 months ago
Haroon Amjad 4fcaea2993 updates 2 months ago
Haroon Amjad c65d44ae4d updates 2 months ago
Haroon Amjad 2293db00ea updates 2 months ago
Haroon Amjad b6766654e0 initial commit 2 months ago