Commit Graph

22 Commits (59efdf382b7f1c8abc87b60ac62bf1c4a06a5469)

Author SHA1 Message Date
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
2 days ago
FaizHashmi d75f9a9cc3 icons 2 weeks ago
Sultan khan 1a4dd29a9b no message 2 weeks ago
FaizHashmi 154b62bbad Added sub categories 2 weeks ago
Sultan khan 821cdf474d ui updates 2 weeks ago
FaizHashmi 858fa7edb7 changes 3 weeks ago
Sultan khan 9638d98b76 no message 3 weeks ago
aamir-csol 234dce65e5 chat bot & Speech to Text 10 months ago
Aamir Muhammad 56b18c493a mazaya banner changes 1 year ago
Aamir Muhammad 72c178382f time sheet changes 2 years ago
Sultan khan fd6058e87d Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
#	assets/langs/ar-SA.json
#	assets/langs/en-US.json
#	lib/app_state/app_state.dart
#	lib/generated/locale_keys.g.dart
4 years ago
Aamir Muhammad 12defa65ac Merge branch 'master' into development_aamir 4 years ago
haroon amjad bcf67895b9 Dynamic forms & my team fixes 4 years ago
Aamir Muhammad abd1fa9375 chat voice message implementation 4 years ago
Sikander Saleem 3cac5eebbc Chat Fixes 4 years ago
Aamir Muhammad ee0e774611 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/colors.dart
#	lib/classes/consts.dart
4 years ago
Aamir Muhammad 8ba3dcf43b Chat Fixes & Favorite Api Implementation 4 years ago
devmirza121 f06238a93f OTP dialog new design 4 years ago
Aamir Muhammad b190a248bf Chat Implementation Version 1 4 years ago
devmirza121 68729ddbb9 NFC Attendance implement 5 years ago
devmirza121 c4b7046a90 Dashboard API's 1.3 5 years ago
tall3at 89f6df8c77 basic structure 5 years ago