Commit Graph

123 Commits (7c980cc353f5658f07d1540ca6d32bb324b6dc98)

Author SHA1 Message Date
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 eaf0ff3525 ios changes 2 years ago
Sikander Saleem 3702bac7c2 voip merge conflicts resolve 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
haroon amjad 52d389b268 In App update implemented 2 years ago
haroon amjad cd4b9d8c74 updates 2 years ago
haroon amjad 3037925016 Merge branch 'development_aamir' into development_haroon_merge_aamir
# Conflicts:
#	lib/app_state/app_state.dart
2 years ago
Aamir Muhammad 42c3b7a8af Updates To 3.10 2 years ago
haroon amjad e39526b5eb Updates & fixes 2 years ago
Aamir Muhammad 3ec44940df Ios Voip Kit Changes 2 years ago
Aamir Muhammad 9f33b2e0e7 Revert "Ios Voip Kit"
This reverts commit 4f3437cba9.
2 years ago
Aamir Muhammad 4f3437cba9 Ios Voip Kit 2 years ago
Aamir Muhammad 23820e7e5e Ios Voip Kit 2 years ago
Aamir Muhammad 364d1292a0 OneSignal Api 2 years ago
Aamir Muhammad bceae623ed End Call Android Native 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 1d7de73d28 End Call Android Native 2 years ago
Aamir Muhammad 3a821a1744 End Call Android Native 2 years ago
Aamir Muhammad 5870e80255 End Call Android 2 years ago
Aamir Muhammad 2e22bfb483 End Call 2 years ago
Aamir Muhammad a8b1a001f8 Android Native 2 years ago
Aamir Muhammad 9e437b7ee9 Call Decline & Fixes 2 years ago
haroon amjad d7d90f620e VoIP udpates 2 years ago
Aamir Muhammad 6e85b81c73 Call Decline & Fixes 2 years ago
Aamir Muhammad a992c8dae9 Changes On iOS 2 years ago
haroon amjad 9030b9bc81 Notification details implemented 2 years ago
haroon amjad f8c207d33f updates 2 years ago
Aamir Muhammad 02073faf9d Changes On iOS 2 years ago
Aamir Muhammad 02870af3d2 Changes On iOS 2 years ago
Aamir Muhammad 9dd4456c51 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/app_state/app_state.dart
#	lib/classes/notifications.dart
#	lib/ui/landing/itg/its_add_screen_video_image.dart
#	lib/ui/login/login_screen.dart
#	pubspec.yaml
3 years ago
Aamir Muhammad d1ccaf7f56 Chat Fix & Calling 3 years ago
Aamir Muhammad 7191e25ea5 Chat Redirect Fix 3 years ago
Sikander Saleem d971f4a651 po worklist forward & approve and forward RespondAttributeList payload improvement. 3 years ago
haroon amjad 33294ee697 survey changes 3 years ago
mirza.shafique 7d7acfa2df Merge branch 'master' into development_mirza
# Conflicts:
#	lib/main.dart
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 7af10ec337 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/ui/landing/dashboard_screen.dart
#	lib/ui/login/login_screen.dart
3 years ago
haroon amjad 4bac19f9b8 Platform ID & Huawei fixes 3 years ago
Faiz Hashmi 990b830bfa Added test Dialog for Huawei 3 years ago
Faiz Hashmi 8439b58759 Added Huawei Checks 3 years ago
Aamir Muhammad 5a338199b9 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/ui/login/login_screen.dart
3 years ago
Aamir Muhammad b21142e4af Webrtc Calling 3 years ago
haroon amjad ca369f2243 huawei attendance fixes 3 years ago
haroon amjad 516f7ca301 Crashlytics implemented 3 years ago
haroon amjad b760dc44a5 Updates & fixes 3 years ago
haroon amjad 182fa6774e Huawei push implementation 3 years ago