Commit Graph

152 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
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
Sikander Saleem 58962ede03 CR-6273 implemented. 2 years ago
haroon amjad 281f0bab78 updates 2 years ago
haroon amjad a58d4753e4 Merge branch 'sultan-dev' into development_haroon
# Conflicts:
#	assets/langs/en-US.json
#	lib/classes/utils.dart
#	lib/generated/codegen_loader.g.dart
#	lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
#	pubspec.yaml
2 years ago
Aamir Muhammad 73cb717bfb Merge branch 'master' into development_aamir
# Conflicts:
#	pubspec.yaml
2 years ago
Sikander Saleem 23b4e81170 my documents added. 2 years ago
Aamir Muhammad f903700639 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
Sultan khan 608a8fcb97 Merge branch 'master' of http://34.17.52.79/Haroon6138/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/codegen_loader.g.dart
#	lib/generated/locale_keys.g.dart
2 years ago
Aamir Muhammad 3a821a1744 End Call Android Native 2 years ago
Sultan khan 790103bdc9 chat 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
3 years ago
Sikander Saleem 571b8bd7af itg active directory password change added. 3 years ago
Sultan khan 9cb71b525e group chat started 3 years ago
mirza.shafique 7d7acfa2df Merge branch 'master' into development_mirza
# Conflicts:
#	lib/main.dart
3 years ago
haroon amjad 99c1f95e1f Attendance Progress screen fixes 3 years ago
haroon amjad e0d02554b1 Merge branch 'master' into development_haroon 3 years ago
haroon amjad 182fa6774e Huawei push implementation 3 years ago
Aamir Muhammad 2303daa1ad Merge branch 'master' into development_aamir 3 years ago
Aamir Muhammad a8008bb9a7 Chat Fix & Web RTC Methods 3 years ago
mirza.shafique 2455e27595 hmg wifi implementation 3 years ago
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Aamir Muhammad a78b5b0a19 Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/notifications.dart
3 years ago
Aamir Muhammad c55c3d6a91 Notification 3 years ago
Aamir Muhammad 4a431fb752 Notification Fix 3 years ago
Sikander Saleem 0e329e8e2b ticket balance value display fixed & infant added in value. 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 c8f9826266 Permission Issue 3 years ago
Aamir Muhammad b152f8a6d6 Permission Issue 3 years ago
Aamir Muhammad 1f69ee262d 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
Aamir Muhammad dbb13515fc Audio Fix 3 years ago
Sikander Saleem 377fd48693 Ios Fix 3 years ago
Aamir Muhammad 83b8691a31 Ios Stream Audio 3 years ago
Sikander Saleem 16ea3b7c66 Ios Fix 3 years ago
haroon amjad 0d2052346e updates 3 years ago
Sikander Saleem 088fd6f318 Ios Fix 3 years ago
Aamir Muhammad 5028a3b860 App Bar online / Offline & Fixes 3 years ago
Aamir Muhammad a746b607df Fixes 3 years ago