 Aamir Muhammad
|
109fb19d04
|
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
|
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 |
|
Aamir Muhammad
|
364d1292a0
|
OneSignal Api
|
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
|
6166b5399f
|
Changes
|
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
|
571b8bd7af
|
itg active directory password change added.
|
3 years ago |
|
Sultan khan
|
9cb71b525e
|
group chat started
|
3 years ago |
|
Sikander Saleem
|
d971f4a651
|
po worklist forward & approve and forward RespondAttributeList payload improvement.
|
3 years ago |
|
Faiz Hashmi
|
dc864bcd05
|
Minor Fix
|
3 years ago |
|
Sikander Saleem
|
e10ea6b023
|
mark attendance session expire fixed
|
3 years ago |
mirza.shafique
|
5f525f16a0
|
local network test
|
3 years ago |
|
Faiz Hashmi
|
7f02dff689
|
Added the Sequence Number in Question Options and Removed isCorrectOption
|
3 years ago |
|
Sikander Saleem
|
3083a0e9da
|
improvement.
|
3 years ago |
|
Sikander Saleem
|
83820a8a20
|
worklist detail remove type lists when become empty.
|
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
|
fe02776a69
|
leave balance issues fixed.
|
3 years ago |
|
Aamir Muhammad
|
e40cd2c5c8
|
Chat Error Handling & Voice
|
3 years ago |
|
Faiz Hashmi
|
2caf5b6caa
|
Pushing for testing
|
3 years ago |
haroon amjad
|
4a513c08d9
|
fixes
|
3 years ago |
|
Faiz Hashmi
|
8ae8f6d2fe
|
Merge branch 'master' into faiz_cs
# Conflicts:
# lib/generated/codegen_loader.g.dart
|
3 years ago |
|
Faiz Hashmi
|
810920a934
|
Pushing after resolving multiple times API calling issue
|
3 years ago |
|
Sultan khan
|
a212963ad7
|
Merge branch 'master' of https://gitlab.com/Cloud_Solution/mohemm-flutter-app into sultan-dev
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |
|
Sultan khan
|
d25e608565
|
bug fixes
|
3 years ago |
|
haroon amjad
|
6efc07fcab
|
Jira fixes
|
3 years ago |
|
Faiz Hashmi
|
4e4e393f3d
|
updated endpoints
|
3 years ago |
|
Faiz Hashmi
|
ead2dcb631
|
Committing after API replacement from SignalR => InProgress
|
3 years ago |
|
Faiz Hashmi
|
677a0ca275
|
Committing after API replacement from SignalR => InProgress
|
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 |
|
haroon amjad
|
f3ffdc0088
|
marathon URL update
|
3 years ago |
|
haroon amjad
|
8133542ae0
|
Merge branch 'master' into development_haroon
# Conflicts:
# lib/classes/consts.dart
|
3 years ago |