Commit Graph

15 Commits (2f22519d86d606d4683308d742241ac348052766)

Author SHA1 Message Date
Aamir Muhammad 2f22519d86 Merge remote-tracking branch 'origin/sultan-dev' into development_aamir
# Conflicts:
#	android/app/src/main/AndroidManifest.xml
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/api/chat/chat_api_client.dart
#	lib/app_state/app_state.dart
#	lib/classes/consts.dart
#	lib/generated_plugin_registrant.dart
#	lib/main.dart
#	lib/provider/chat_provider_model.dart
#	lib/ui/chat/group_chat_detaied_screen.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	lib/widgets/image_picker.dart
#	pubspec.yaml
2 years ago
Sultan khan f21348d9b7 Merge branch 'development_haroon_merge_aamir' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
#	android/gradle/wrapper/gradle-wrapper.properties
#	lib/api/chat/chat_api_client.dart
#	lib/classes/consts.dart
#	lib/generated_plugin_registrant.dart
#	lib/main.dart
#	lib/provider/chat_provider_model.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
2 years ago
haroon amjad a411b8e978 File picker permission issue fixed 2 years ago
haroon amjad 8f83f89dc7 Item for sale improvements 3 years ago
haroon amjad 0d2052346e updates 3 years ago
Aamir Muhammad 7d1086522d Chat Fixes & Counter Updated on Signal R 3 years ago
haroon amjad 0ca002d9be Merge branch 'master' into development_haroon
# Conflicts:
#	lib/ui/chat/chat_home_screen.dart
3 years ago
Aamir Muhammad 55ff08c3f3 Chat Favorite Screen & Fixes 3 years ago
Aamir Muhammad 8ba3dcf43b Chat Fixes & Favorite Api Implementation 3 years ago
haroon amjad d77f9a3362 Worklist fixes 3 years ago
haroon amjad f07167e734 Leave balance fix, Items for sale fix 3 years ago
haroon amjad f6c9b6dce9 Updates & fixes 3 years ago
Sikander Saleem cbcb3cdc00 item for sale improvement cont. 3 years ago
haroon amjad a05d037211 Merge branch 'master' into development_haroon
# Conflicts:
#	lib/classes/colors.dart
#	lib/extensions/string_extensions.dart
#	lib/ui/screens/announcements/announcement_details.dart
#	lib/ui/screens/announcements/announcements.dart
#	lib/ui/screens/mowadhafhi/mowadhafhi_home.dart
#	lib/widgets/dynamic_forms/dynamic_textfield_widget.dart
3 years ago
haroon amjad a855e535cd Item for sale implemented 3 years ago