Commit Graph

51 Commits (cf1908b44a447ca8591614e1a1f14dfe9894fc35)

Author SHA1 Message Date
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
4 months ago
aamir-csol 85fac13314 changes 4 months ago
haroon amjad 712e11c69a prescription details page implementation contd. 4 months ago
haroon amjad 8bc49929d4 prescription orders list page implemented 4 months ago
haroon amjad 6f07bc7c2c Radiology Orders implemented 4 months ago
haroon amjad 4c241b0dac Lab orders implemented 4 months ago
Sultan khan 0de09dd72c no message 4 months ago
Sultan khan 39c284d036 Merge remote-tracking branch 'origin/master' into dev_sultan
# Conflicts:
#	lib/presentation/home/landing_page.dart
4 months ago
Sultan khan f55d82ddb3 bottom navigation 4 months ago
Haroon Amjad 36c6f0d541 Landing page updates 4 months ago
Haroon Amjad 2b22e17743 android fixes 4 months ago
aamir-csol 7321da67e3 register step 2 & fixes 4 months ago
aamir-csol ed24365eff Merge branch 'master' into dev_aamir
# Conflicts:
#	lib/presentation/home/landing_page.dart
#	lib/theme/colors.dart
4 months ago
Haroon Amjad f5e655fd35 Lab order API implemented 5 months ago
Haroon Amjad a77fc49c68 lab result changes 5 months ago
haroon amjad e044fc8c5e lab implementation contd. 5 months ago
haroon amjad 89456bc2aa Medical File Insurance tab content done 5 months ago
aamir-csol d1e1154bdb changes 5 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
5 months ago
aamir-csol 67e580447e changes 5 months ago
haroon amjad 9b1c3fe920 medical file updates 5 months ago
faizatflutter c6a95fe7d7 latest push after master merged 5 months ago
faizatflutter 1af571705a Merge branch 'master' into faiz_dev1
# Conflicts:
#	lib/core/utils/utils.dart
#	lib/presentation/home/landing_page.dart
5 months ago
faizatflutter 9509d4a192 completed the deviceapi with new architecture 5 months ago
haroon amjad 4ecbcb9332 Homepage & medical implementation contd. 5 months ago
faizatflutter 6bc7af00bc completed the deviceapi with new architecture 5 months ago
aamir-csol 8f1e4500cc register & Exception bottom sheet, country dropdown. 5 months ago
aamir-csol 5e292544d7 Merge remote-tracking branch 'origin/faiz_dev1' into dev_aamir
# Conflicts:
#	lib/main.dart
#	lib/presentation/authentication/register.dart
#	lib/providers/authentication_view_model.dart
5 months ago
faizatflutter 89e9323d9e merged master and updated structure 5 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
5 months ago
faizatflutter c1221e4970 pushed device api 5 months ago
aamir-csol 6f98690929 register & changes 5 months ago
Sultan khan 4e010bb2cf initial commit 5 months ago
aamir-csol 9c52a6122f 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
#	lib/presentation/authantication/login.dart
5 months ago
aamir-csol a4da9db6c3 register & changes 5 months ago
Haroon Amjad 0a39a00df5 Landing page updates 5 months ago
Sultan khan d3aff9f93d updating structure 5 months ago
aamir-csol 8ed8637108 Merge branch 'refs/heads/master' into dev_aamir
# Conflicts:
#	lib/presentation/authantication/login.dart
5 months ago
aamir-csol ea15bd9152 bottom sheet 5 months ago
Haroon Amjad 30fd99d122 android fixes 5 months ago
Sultan khan cbfb381615 Merge branch 'faiz_dev' into faiz_dev1
# Conflicts:
#	ios/Podfile.lock
#	lib/main.dart
#	lib/routes/app_routes.dart
#	pubspec.lock
5 months ago
faizatflutter 45e868adba pushed new API 5 months ago
aamir-csol 4d76b34608 app bar & chip 5 months ago
Faiz Hashmi 357cf4392e Updated architecture 5 months ago
aamir-csol 255d189ce1 widgets & fixes 5 months ago
aamir-csol 4e3ba99280 widgets & fixes 5 months ago
Faiz Hashmi d65dc4ea89 initial commit 5 months ago
Haroon Amjad 4fcaea2993 updates 5 months ago
Haroon Amjad c65d44ae4d updates 5 months ago
Haroon Amjad 2293db00ea updates 5 months ago