Commit Graph

17 Commits (cd399a032c77191f2ed30278e5ced21d23fca41f)

Author SHA1 Message Date
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
20 hours 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
3 days 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
2 weeks ago
haroon amjad 9c994d8dec Merge branch 'master_mohemm_flutter'
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	ios/Runner/Info.plist
#	lib/main.dart
#	pubspec.yaml
4 weeks ago
taha a6be594b3b Update dependencies and improve code structure 1 month ago
haroon amjad 152cd5c019 update 8 months ago
Aamir Muhammad 0e54c7dac9 worklist actions fragment action button changes 1 year ago
Aamir Muhammad cd36d61640 logins apis 1 year ago
sultan khan be46dcb9b1 employee search work in progress 2 years ago
haroon amjad cdd56b2a5a Issue fixes & updates 2 years ago
haroon amjad 096c52d979 worklist updates 2 years ago
Aamir Muhammad 6cf7340417 Business Card Design Update 3 years ago
haroon amjad 1a8db3b0ee ERM Channel updates 3 years ago
haroon amjad 182fa6774e Huawei push implementation 4 years ago
Sikander Saleem 6b9ea200ad login flow added. 5 years ago
Sikander Saleem 8470495332 Gradle updated, fonts added & structure improvements 5 years ago
tall3at 1b6ebc67c3 first commit 5 years ago