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 |
|
Sultan khan
|
c86d9f4678
|
termination work-list fixed
|
2 years ago |
Faiz Hashmi
|
684a200285
|
Join MarathonProviderFix
|
2 years ago |
 haroon amjad
|
ff908bd2a7
|
updates
|
2 years ago |
|
Sultan khan
|
88be17249d
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
# lib/ui/my_attendance/dynamic_screens/dynamic_input_screen.dart
|
2 years ago |
|
Sultan khan
|
c9886be2d8
|
work list ITG str change
|
2 years ago |
|
Sultan khan
|
d7f45fa0b9
|
ITG change pushed.
|
2 years ago |
devamirsaleemahmad
|
12ec0a25ee
|
business trip settlement fix.
|
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 |
 Aamir Muhammad
|
3f6c5b9c30
|
Updates To 3.10
|
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 |
Sikander Saleem
|
23b4e81170
|
my documents added.
|
2 years ago |
|
haroon amjad
|
1a8db3b0ee
|
ERM Channel updates
|
2 years ago |
|
Aamir Muhammad
|
23820e7e5e
|
Ios Voip Kit
|
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 |
|
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 |
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
|
6e85b81c73
|
Call Decline & Fixes
|
2 years ago |
|
haroon amjad
|
9030b9bc81
|
Notification details implemented
|
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 |
|
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
|
879e2aa561
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
571b8bd7af
|
itg active directory password change added.
|
3 years ago |
haroon amjad
|
b1e140fb75
|
PR Details implemented
|
3 years ago |
|
Sultan khan
|
9cb71b525e
|
group chat started
|
3 years ago |
|
haroon amjad
|
064be6d195
|
updates & fixes
|
3 years ago |
|
Sikander Saleem
|
dc458f126e
|
Merge branch 'master' into development_sikander
|
3 years ago |
|
Sikander Saleem
|
cd091b696a
|
worklist pagination added.
|
3 years ago |
|
Sikander Saleem
|
d971f4a651
|
po worklist forward & approve and forward RespondAttributeList payload improvement.
|
3 years ago |
|
Faiz Hashmi
|
1dc6e1ae67
|
Reduced the option selection threshold from One to Zero
|
3 years ago |
|
haroon amjad
|
c34d8a2633
|
Location updates
|
3 years ago |
|
Aamir Muhammad
|
617145fd07
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
haroon amjad
|
d49a030580
|
PR details from PO 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 |
|
haroon amjad
|
72501fd0d9
|
ITG Ads fix
|
3 years ago |
|
Aamir Muhammad
|
5a338199b9
|
Merge branch 'master' into development_aamir
# Conflicts:
# lib/ui/login/login_screen.dart
|
3 years ago |
|
haroon amjad
|
5e22bcc1da
|
ERM Channel
|
3 years ago |
|
haroon amjad
|
20109cbe9e
|
Attendance fixes
|
3 years ago |
|
haroon amjad
|
a142a5e8df
|
Merge branch 'master' into development_haroon
|
3 years ago |
|
haroon amjad
|
3b13701cec
|
Android fixes
|
3 years ago |
|
Faiz Hashmi
|
dc864bcd05
|
Minor Fix
|
3 years ago |
|
Aamir Muhammad
|
74e01e60fb
|
Chat Fix & Web RTC Methods
|
3 years ago |
haroon amjad
|
d3c5fd1467
|
Revert "Merge branch 'development_haroon' into 'master'"
This reverts merge request !158
|
3 years ago |