Commit Graph

1758 Commits (1817647b2723a583e0bada8fab8ea2246b33ab0e)
 

Author SHA1 Message Date
haroon amjad 1817647b27 Update to stores, VersionID 10.3 2 hours ago
haroon amjad cfe56b6db0 Merge branch 'master_mohemm_flutter'
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/widgets/mark_attendance_widget.dart
#	pubspec.yaml
2 hours ago
haroon amjad 3464d7f1ef Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter 2 hours ago
Haroon6138 a77197da91 Merge pull request 'master_merge' (#24) from master_merge into master
Reviewed-on: https://34.17.182.140/Haroon6138/mohemm-flutter-app/pulls/24
2 hours ago
Sultan khan 3a31b8f430 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_merge
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Updates
  NFC fix

# Conflicts:
#	lib/api/profile_api_client.dart
2 hours ago
Sultan khan 4ebcf59b9d updates and fixes 2 hours ago
haroon amjad 0ffbadedc3 Updates 2 hours ago
haroon amjad e78252126d Merge branch 'master_merge' 4 hours ago
haroon amjad f51dcbd04d Merge branch 'master_merge' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_merge 4 hours ago
Sultan khan 39f8f821de no message 6 hours ago
haroon amjad 6ee3594403 NFC fix 1 day ago
haroon amjad 7bf91cdc40 NFC fix 1 day ago
Sultan khan 2b53a56b15 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_merge
* 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Android device id plugin changed
1 day ago
Sultan khan 83df2f3626 bug fixes and added contact approval process api 1 day ago
haroon amjad db380435e0 updates 2 days ago
haroon amjad 796e697dec Merge branch 'master_mohemm_flutter'
# Conflicts:
#	pubspec.yaml
2 days ago
haroon amjad f1c0e1473b Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter 2 days ago
haroon amjad b9e5d0a1a4 update 2 days ago
haroon amjad 3507e13aa3 Merge branch 'master_merge' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_merge 2 days ago
haroon amjad 396ea61086 Android device id plugin changed 2 days ago
Sultan khan 5852320906 Merge branch 'master_merge' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_merge
* 'master_merge' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Update to stores, VersionID 10.2
  Updates
1 week ago
haroon amjad ea25ce56a5 Update to stores, VersionID 10.2 1 week ago
haroon amjad cd399a032c Merge branch 'master_mohemm_flutter'
# Conflicts:
#	assets/langs/ar-SA.json
#	ios/Runner/Info.plist
#	lib/app_state/app_state.dart
#	lib/provider/chat_provider_model.dart
#	lib/ui/dialogs/id/business_card_dialog.dart
1 week ago
haroon amjad bd6ead1873 Merge branch 'master' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into master_mohemm_flutter 1 week ago
Haroon Amjad 439140dba2 Update to stores, VersionID 10.2 1 week ago
haroon amjad 67802bb021 Updates 1 week ago
Sultan khan 59efdf382b no message 1 week ago
khansultan1 d7b88e2e73 Merge pull request 'wala_plus_with_dialog_removal' (#22) from wala_plus_with_dialog_removal into master_merge
Reviewed-on: Haroon6138/mohemm-flutter-app#22
1 week ago
Sultan khan f9332d29ae no message 1 week ago
Sultan khan 95888fdb64 no message 1 week ago
Sultan khan 548aa501a1 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Security changes
  Update dependencies and remove unused keys from localization
  changes for Latest AGP
  Update dependencies and improve code structure
  chat history maintained
  translation added.
  Chat Bot Completed
  Chat Bot Completed
  chat bot & Speech to Text
1 week ago
haroon amjad 38906e24b7 Merge branch 'master' into wala_plus_with_dialog_removal
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	ios/Flutter/AppFrameworkInfo.plist
#	ios/Runner.xcodeproj/project.pbxproj
#	ios/Runner/Info.plist
#	lib/classes/consts.dart
#	lib/config/routes.dart
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
#	lib/models/generic_response_model.dart
#	lib/models/get_mobile_login_info_list_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/verify_last_login_screen.dart
#	pubspec.yaml
1 week ago
Sultan khan c32b155718 ui updates 1 week ago
haroon amjad efee685178 Security changes 1 week ago
Sultan khan f483c858ef Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  made the city search functional
2 weeks ago
FaizHashmi 3dcb332a04 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 2 weeks ago
FaizHashmi 48e5d70ada made the city search functional 2 weeks ago
Sultan khan 3cf2c2a4c8 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  made the city search functional
2 weeks ago
FaizHashmi 06295821aa made the city search functional 2 weeks ago
Sultan khan ae1bd7f0c5 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Fav Tab Changes and SearchBar Fix
  icons
2 weeks ago
FaizHashmi 6ba06065b3 Fav Tab Changes and SearchBar Fix 2 weeks ago
FaizHashmi d75f9a9cc3 icons 3 weeks ago
Sultan khan 63f678b666 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal 3 weeks ago
FaizHashmi ef7078c152 Merge remote-tracking branch 'origin/wala_plus_with_dialog_removal' into wala_plus_with_dialog_removal 3 weeks ago
FaizHashmi 252b9b471c Toast fixed 3 weeks ago
Sultan khan bd6e9577e3 Merge branch 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app into wala_plus_with_dialog_removal
* 'wala_plus_with_dialog_removal' of http://34.17.182.140/Haroon6138/mohemm-flutter-app:
  Toast fixed

# Conflicts:
#	lib/generated/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
3 weeks ago
Sultan khan e6cc2491b4 no message 3 weeks ago
Sultan khan 5194f8b1fd no message 3 weeks ago
FaizHashmi 2fb4a99a42 Toast fixed 3 weeks ago
Sultan khan fe36263ac0 design changed 3 weeks ago