Commit Graph

161 Commits (development_aamir)

Author SHA1 Message Date
Aamir Muhammad 185192e9a2 Call Fixes 2 years ago
Aamir Muhammad 109fb19d04 Call native code android & ios 2 years ago
Aamir Muhammad 7c980cc353 Call native code android & ios 2 years ago
Aamir Muhammad 28d977017e Sultan Merge 2 years ago
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
Sikander Saleem 3702bac7c2 voip merge conflicts resolve 2 years ago
haroon amjad a2ed4e52f3 Marathon changes 2 years ago
Faiz Hashmi 9a6d2d44e1 before staring participant fix. 2 years ago
Aamir Muhammad 33fb6fe6be Voip Call 2 years ago
Aamir Muhammad f8ba1957cd Merge branch 'master' into development_aamir
# Conflicts:
#	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/landing/dashboard_screen.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
2 years ago
Aamir Muhammad bcff7ebf17 Change 2 years ago
haroon amjad ff908bd2a7 updates 2 years ago
haroon amjad 281f0bab78 updates 2 years ago
haroon amjad cd4b9d8c74 updates 2 years ago
Aamir Muhammad 41e4ec0eee Ios Voip Kit Changes 2 years ago
Aamir Muhammad 3ec44940df Ios Voip Kit Changes 2 years ago
Aamir Muhammad 23820e7e5e Ios Voip Kit 2 years ago
Aamir Muhammad fb63963905 Merge branch 'aamir_dev' into development_aamir_testing
# Conflicts:
#	lib/api/chat/chat_api_client.dart
#	lib/classes/chat_call_kit.dart
#	lib/main.dart
#	lib/provider/chat_call_provider.dart
#	lib/ui/chat/call/chat_incoming_call_screen.dart
#	lib/ui/chat/chat_detailed_screen.dart
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
2 years ago
Aamir Muhammad bce79efdd2 End Call Android Native 2 years ago
Aamir Muhammad 7bc36188c4 End Call Android Native 2 years ago
Aamir Muhammad 3a821a1744 End Call Android Native 2 years ago
Aamir Muhammad a8b1a001f8 Android Native 2 years ago
Sultan khan 790103bdc9 chat changes 2 years ago
Aamir Muhammad 9e437b7ee9 Call Decline & Fixes 2 years ago
Aamir Muhammad a992c8dae9 Changes On iOS 2 years ago
Aamir Muhammad aed4a9602b Changes On iOS 2 years ago
Aamir Muhammad 8db09f20b7 Changes On iOS 2 years ago
Aamir Muhammad 88ac343203 Changes On iOS 2 years ago
Aamir Muhammad 9dcbdee156 Changes On iOS 2 years ago
Aamir Muhammad 02073faf9d Changes On iOS 2 years ago
Aamir Muhammad 02870af3d2 Changes On iOS 2 years ago
Aamir Muhammad fa62bb13d5 Changes 2 years ago
Aamir Muhammad c4c7a91d7b Chat Fix & Calling 3 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
3 years ago
Aamir Muhammad d1ccaf7f56 Chat Fix & Calling 3 years ago
Aamir Muhammad 7191e25ea5 Chat Redirect Fix 3 years ago
Sultan khan 9cb71b525e group chat started 3 years ago
Aamir Muhammad 617145fd07 Merge branch 'master' into development_aamir 3 years ago
haroon amjad 1ebcbd1079 ERM Channel Audio playback implemented 3 years ago
Aamir Muhammad b21142e4af Webrtc Calling 3 years ago
Aamir Muhammad 74e01e60fb Chat Fix & Web RTC Methods 3 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 3 years ago
Aamir Muhammad 948689b67a Notification To Specific Screen 3 years ago
Aamir Muhammad ffd894ca28 Notification To Specific Screen 3 years ago
Sikander Saleem f8ae5b0987 mark attendance session expire fixed 3 years ago
Aamir Muhammad 7152b0d57b Chat Fix 3 years ago
Aamir Muhammad c8f9826266 Permission Issue 3 years ago
haroon amjad f933539395 dialog added to app settings 3 years ago
haroon amjad c763e16f41 Merge branch 'master' into development_haroon 3 years ago