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
|
74bc09d5d6
|
Merge branch 'master' of http://34.17.52.79/Haroon6138/mohemm-flutter-app into sultan-dev
# Conflicts:
# lib/app_state/app_state.dart
|
2 years ago |
|
Sultan khan
|
c86d9f4678
|
termination work-list fixed
|
2 years ago |
Faiz Hashmi
|
5723b64234
|
Join MarathonProviderFix
|
2 years ago |
|
Sultan khan
|
d4a795dda1
|
half day leave bug fixed
|
2 years ago |
|
Sultan khan
|
d7f45fa0b9
|
ITG change pushed.
|
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 |
 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 |
|
Aamir Muhammad
|
e90d9eecd2
|
Ios Voip Kit Changes
|
2 years ago |
|
Aamir Muhammad
|
9f33b2e0e7
|
Revert "Ios Voip Kit"
This reverts commit 4f3437cba9.
|
2 years ago |
|
haroon amjad
|
1a8db3b0ee
|
ERM Channel updates
|
2 years ago |
|
Aamir Muhammad
|
4f3437cba9
|
Ios Voip Kit
|
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 |
|
Sultan khan
|
790103bdc9
|
chat changes
|
2 years ago |
|
Aamir Muhammad
|
9e437b7ee9
|
Call Decline & Fixes
|
2 years ago |
|
Aamir Muhammad
|
aed4a9602b
|
Changes On iOS
|
2 years ago |
|
haroon amjad
|
9030b9bc81
|
Notification details implemented
|
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 |
|
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 |
|
haroon amjad
|
1dca3076d9
|
Survey dynamic questions
|
3 years ago |
haroon amjad
|
b1e140fb75
|
PR Details implemented
|
3 years ago |
|
Sultan khan
|
9cb71b525e
|
group chat started
|
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
|
b21142e4af
|
Webrtc Calling
|
3 years ago |
|
Aamir Muhammad
|
74e01e60fb
|
Chat Fix & Web RTC Methods
|
3 years ago |
|
Aamir Muhammad
|
a8008bb9a7
|
Chat Fix & Web RTC Methods
|
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 |
|
Faiz Hashmi
|
7f02dff689
|
Added the Sequence Number in Question Options and Removed isCorrectOption
|
3 years ago |
|
Aamir Muhammad
|
a746b607df
|
Fixes
|
3 years ago |
|
Aamir Muhammad
|
3871d3f1e3
|
Fixes
|
3 years ago |
|
Aamir Muhammad
|
35f814b74a
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Faiz Hashmi
|
5ff4c19301
|
Merge branch 'master' into faiz_cs
|
3 years ago |
|
Aamir Muhammad
|
4635c7f3bc
|
Merge branch 'master' into development_aamir
|
3 years ago |
|
Faiz Hashmi
|
5bb998a8d2
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/classes/utils.dart
# lib/ui/marathon/widgets/marathon_banner.dart
|
3 years ago |
|
Faiz Hashmi
|
d9749fc402
|
Updated NoWinnerFoundDesign and some Logical Up gradations
|
3 years ago |
|
Sikander Saleem
|
642fee7331
|
worklist setting update data payload issue fixed.
|
3 years ago |
|
Aamir Muhammad
|
fb3b3e8e46
|
Voice Chat Fixes & Audio Player Implementation
|
3 years ago |
|
Aamir Muhammad
|
47a697f352
|
chat voice message implementation
|
3 years ago |
|
Aamir Muhammad
|
abd1fa9375
|
chat voice message implementation
|
3 years ago |
|
haroon amjad
|
ece6a68a95
|
fixes
|
3 years ago |
|
haroon amjad
|
3b6f3f5c4f
|
Address info issue fixed
|
3 years ago |