Commit Graph

137 Commits (185192e9a28e375efa3efbaaf84e49feab65793e)

Author SHA1 Message Date
Aamir Muhammad 185192e9a2 Call Fixes 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
haroon amjad a48d703642 ITG ADs update 2 years ago
Aamir Muhammad 3a821a1744 End Call Android Native 2 years ago
haroon amjad 1dca3076d9 Survey dynamic questions 3 years ago
haroon amjad b1e140fb75 PR Details implemented 3 years ago
Sikander Saleem d971f4a651 po worklist forward & approve and forward RespondAttributeList payload improvement. 3 years ago
haroon amjad 1ebcbd1079 ERM Channel Audio playback implemented 3 years ago
haroon amjad 379015ca6c chat privilege added 3 years ago
Faiz Hashmi 601a0cdbfd Added test Dialog for Huawei 3 years ago
haroon amjad 5e22bcc1da ERM Channel 3 years ago
haroon amjad aacc7c6437 icon change 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
haroon amjad 91eb51e42f marathon updates & DateFormat fixes 3 years ago
Sikander Saleem 550e26dce1 Attendance loader fix 3 years ago
Sultan khan b227f11c7b Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev 3 years ago
Sultan khan 61904ca5f7 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/classes/consts.dart
#	lib/generated/locale_keys.g.dart
#	lib/ui/landing/dashboard_screen.dart
3 years ago
Sultan khan 3b2ef69f7c Offers and discount and Item for sale changes done. 3 years ago
Aamir Muhammad 948689b67a Notification To Specific Screen 3 years ago
Aamir Muhammad 75eab961ce Merge branch 'master' into development_aamir
# Conflicts:
#	lib/classes/notifications.dart
3 years ago
Aamir Muhammad ffd894ca28 Notification To Specific Screen 3 years ago
Sikander Saleem 84a07df310 Merge branch 'master' into development_sikander 3 years ago
Sikander Saleem 0f84f9ae65 app life cycle added.
file attachment option added on dynamic form. & improvements
3 years ago
Aamir Muhammad 698aee3482 Notification 3 years ago
Aamir Muhammad c8f9826266 Permission Issue 3 years ago
haroon amjad e685cf188c updates 3 years ago
haroon amjad 47a274b1d3 Merge branch 'master' into development_haroon 3 years ago
Faiz Hashmi 5592989b44 Added Demo Marathon Module 3 years ago
haroon amjad 0d2052346e updates 3 years ago
Faiz Hashmi 5ff4c19301 Merge branch 'master' into faiz_cs 3 years ago
Faiz Hashmi d9749fc402 Updated NoWinnerFoundDesign and some Logical Up gradations 3 years ago
Sikander Saleem 5261f3e416 marathon placement change, worklist type list improvement. 3 years ago
haroon amjad 631752cffa fixes 3 years ago
Aamir Muhammad 76239d0077 Fixes 3 years ago
Aamir Muhammad feb5c5071c Fav Users Images Fix 3 years ago
Aamir Muhammad 7d1086522d Chat Fixes & Counter Updated on Signal R 3 years ago
Faiz Hashmi f31db58a76 Merge branch 'master' into faiz_cs
# Conflicts:
#	lib/classes/consts.dart
3 years ago
Faiz Hashmi 603ff1b19f Committing after API replacement from SignalR => InProgress 3 years ago
Aamir Muhammad e94a8d9a5e Hub Connection Fix 3 years ago
Aamir Muhammad abc586b81e Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 8d5cc7ed23 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 4e96108207 Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad 0db4a5a7cd Chat Fixes & User Chat Counter 3 years ago
Aamir Muhammad fb97319164 Chat Fixes & User Chat Counter 3 years ago