 Aamir Muhammad
|
185192e9a2
|
Call Fixes
|
2 years ago |
|
Aamir Muhammad
|
109fb19d04
|
Call native code android & ios
|
2 years ago |
|
Aamir Muhammad
|
7f0a466915
|
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 |
|
Aamir Muhammad
|
1a337f82c2
|
Master Merge
|
2 years ago |
|
Aamir Muhammad
|
2f62498c66
|
Merge branch 'master' into development_aamir
# Conflicts:
# android/app/src/main/AndroidManifest.xml
# ios/Runner.xcodeproj/project.pbxproj
# lib/api/chat/chat_api_client.dart
# lib/classes/consts.dart
|
2 years ago |
 haroon amjad
|
fc3c1c057a
|
Attachments handled in transactions list mowadhafi
|
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 |
Faiz Hashmi
|
5723b64234
|
Join MarathonProviderFix
|
2 years ago |
|
Faiz Hashmi
|
ada971c7e4
|
Merge branch 'master' into faiz_dev_marathon_text_fix
# Conflicts:
# lib/classes/consts.dart
|
2 years ago |
|
Faiz Hashmi
|
753d3de3c2
|
Join MarathonProviderFix
|
2 years ago |
Sikander Saleem
|
f6f7d02833
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/classes/consts.dart
|
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 |
|
haroon amjad
|
ff908bd2a7
|
updates
|
2 years ago |
devamirsaleemahmad
|
12ec0a25ee
|
business trip settlement fix.
|
2 years ago |
|
haroon amjad
|
74b12391d2
|
update to store for document upload CR
|
2 years ago |
 Sikander Saleem
|
58962ede03
|
CR-6273 implemented.
|
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 |
|
haroon amjad
|
a48d703642
|
ITG ADs update
|
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
|
73cb717bfb
|
Merge branch 'master' into development_aamir
# Conflicts:
# pubspec.yaml
|
2 years ago |
|
Aamir Muhammad
|
42c3b7a8af
|
Updates To 3.10
|
2 years ago |
|
haroon amjad
|
0fd1c8c96b
|
Merge branch 'master' into development_haroon
|
2 years ago |
|
haroon amjad
|
e39526b5eb
|
Updates & fixes
|
2 years ago |
|
Sikander Saleem
|
23b4e81170
|
my documents added.
|
2 years ago |
|
Aamir Muhammad
|
3ec44940df
|
Ios Voip Kit Changes
|
2 years ago |
|
Aamir Muhammad
|
23820e7e5e
|
Ios Voip Kit
|
2 years ago |
|
haroon amjad
|
59116b700a
|
Location check added
|
2 years ago |
|
Aamir Muhammad
|
364d1292a0
|
OneSignal Api
|
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 |
|
haroon amjad
|
15c8e80799
|
ERM Video fixes
|
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 |
|
Sultan khan
|
aca223c700
|
business trip fixed
|
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
|
fc2aceae0f
|
Merge remote-tracking branch 'origin/development_aamir' into development_aamir
|
2 years ago |
|
Sultan khan
|
790103bdc9
|
chat changes
|
2 years ago |
|
Aamir Muhammad
|
9e437b7ee9
|
Call Decline & Fixes
|
2 years ago |
|
haroon amjad
|
d7d90f620e
|
VoIP udpates
|
2 years ago |
|
Aamir Muhammad
|
8daa975be2
|
Merge branch 'development_aamir' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into development_aamir
|
2 years ago |
|
Aamir Muhammad
|
748e170e02
|
Changes
|
2 years ago |
|
Aamir Muhammad
|
6e85b81c73
|
Call Decline & Fixes
|
2 years ago |