Commit Graph

51 Commits (da68a384aa9f8e353d9f40e582ff53cb0fae7885)

Author SHA1 Message Date
faizatflutter cb299c5bca Design changes on fold 2 months ago
faizatflutter 8c3121fd38 Merge branch 'master' into faiz_dev
# Conflicts:
#	ios/Podfile.lock
2 months ago
Sultan khan 5f559a44dd profile image upload 2 months ago
faizatflutter d8ab3c047f fixed arabic api issue 2 months ago
aamir-csol aa17688de6 Merge branch 'master' into dev_aamir 2 months ago
aamir-csol 2a8f67bba1 family file switch back multi 2 months ago
haroon amjad 78a6d55b35 Merge branch 'master' into watch_integration
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/generated/locale_keys.g.dart
3 months ago
haroon amjad 6a4793f122 Updates 3 months ago
haroon amjad d053f58b7d Updates 3 months ago
Haroon Amjad 30bdfac442 App update page updates 3 months ago
tahaalam 7100283a9d package change activity 4 months ago
tahaalam 3f9046f1e4 Merge remote-tracking branch 'origin/master' into watch_integration
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/core/api_consts.dart
#	lib/generated/locale_keys.g.dart
4 months ago
haroon amjad ec506869cc Android package name updated to new package details 4 months ago
haroon amjad 2be65cba51 Inactive Insurance case handled 4 months ago
haroon amjad 5015747580 LiveCare changes 4 months ago
tahaalam 02398d3bb4 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Runner.xcodeproj/project.pbxproj
#	lib/generated/locale_keys.g.dart
#	lib/theme/colors.dart
4 months ago
tahaalam d137e1166d watch integration ui added. 4 months ago
haroon amjad 102690b2b8 update 4 months ago
haroon amjad 000c403f6b confirm button added 4 months ago
haroon amjad f09d478a03 iOS BundleID changes 4 months ago
haroon amjad 2ab3e178a2 Indoor navigation implemented 4 months ago
haroon amjad cfd0c16738 updates & fixes 5 months ago
haroon amjad 02930a901e Indoor navigation implementation & Landing page swiper card updates 5 months ago
haroon amjad 685eec6a52 updates & fixes 5 months ago
tahaalam 699ef2f672 Merge remote-tracking branch 'origin/ambulance_service' into ambulance_service
# Conflicts:
#	android/settings.gradle.kts
5 months ago
tahaalam 85f9609cbb Merge remote-tracking branch 'origin/master' into ambulance_service
# Conflicts:
#	android/app/libs/PenNavUI.aar
#	android/app/libs/Penguin.aar
#	android/app/libs/PenguinRenderer.aar
#	android/app/src/main/kotlin/com/ejada/hmg/MainActivity.kt
#	android/app/src/main/res/values/strings.xml
#	android/build/reports/problems/problems-report.html
#	ios/Runner/AppDelegate.swift
5 months ago
haroon amjad 575a534f5e PenguinIn fixes 6 months ago
haroon amjad d202aa8423 Smartwatch integration started 6 months ago
haroon amjad 3699163579 PenguinIn SDK changes 6 months ago
haroon amjad 5c0d3144d6 iOS App Icons Added 6 months ago
tahaalam 31261092a8 rrt request creation and history listing 7 months ago
haroon amjad 2b6ee56d71 PenguinIn iOS implementation 7 months ago
tahaalam 1f852f63cf penguin sdk added 7 months ago
tahaalam 5b0a8ad898 cancel and listing request added 7 months ago
faizatflutter f96f3e563c Fixed App CustomChip 7 months ago
haroon amjad 3418480122 Immediate LiveCare implementation completed 9 months ago
Sikander Saleem d464721733 merge conflict fixed. 9 months ago
Haroon Amjad c27ba6ef09 my appointments implementation contd. 9 months ago
haroon amjad d794787459 updates 9 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
faizatflutter c1221e4970 pushed device api 10 months ago
Sultan khan 4e010bb2cf initial commit 10 months ago
Haroon Amjad 0a39a00df5 Landing page updates 10 months ago
Sultan khan d3aff9f93d updating structure 10 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
10 months ago
faizatflutter 45e868adba pushed new API 10 months ago
Faiz Hashmi 357cf4392e Updated architecture 10 months ago
aamir-csol 4e3ba99280 widgets & fixes 10 months ago
Faiz Hashmi d65dc4ea89 initial commit 10 months ago