charitha
|
94097dd0c0
|
Merge branch 'master' into add-emm-analytics
# Conflicts:
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/EventReceiverServiceImpl.java
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/util/AndroidAPIUtils.java
# pom.xml
|
7 years ago |
Nirothipan
|
1f484e6a53
|
resolving conflicts
|
7 years ago |
Nirothipan
|
5b86f692c1
|
resolving conflicts
|
7 years ago |
charitha
|
b48c337d06
|
Refactoring the code
|
7 years ago |
charitha
|
cbd90feb68
|
Add few more tests
|
7 years ago |
charitha
|
baa30d39a3
|
Add more test cases
|
7 years ago |
charitha
|
cafdeaef48
|
Refactor code to be optimized
|
7 years ago |
charitha
|
9532c69874
|
Add test cases for Android Device Management Admin Service.
|
7 years ago |
charitha
|
e37e722ac6
|
Refactored Util methods
|
7 years ago |
charitha
|
1da9ce9187
|
Add oauth based event publisher
|
7 years ago |
charitha
|
269f2e8b7f
|
Finalized device group extension for siddhi
|
7 years ago |
Nirothipan
|
ca2cf5382f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into fileTransfer
|
7 years ago |
Nirothipan
|
d217a72851
|
adding userName parameter to API
|
7 years ago |
charitha
|
609857f624
|
Fix for https://github.com/wso2/product-iots/issues/1423
|
7 years ago |
Nirothipan
|
cff69459be
|
code formatting and updating comments, descriptions
|
7 years ago |
Nirothipan
|
2ddfbed6db
|
changing variable names
|
7 years ago |
Nirothipan
|
a79580b8ac
|
code formatting
|
7 years ago |
megala21
|
c73d1da8f2
|
Fixing https://github.com/wso2/product-iots/issues/1388
|
7 years ago |
Nirothipan
|
79447cbaf7
|
changing operation names
|
7 years ago |
Nirothipan
|
c9bac2c860
|
fileTransferfeature, uploading files from device to ftp server
|
7 years ago |
Nirothipan
|
80941b8d2b
|
making error messages more meaningful
|
7 years ago |
Nirothipan
|
85752584bb
|
modifying messages
|
7 years ago |
Nirothipan
|
118587ae6e
|
file transfer feature
|
7 years ago |
sameera910409
|
b275f5aead
|
fixes https://github.com/wso2/product-iots/issues/364
|
7 years ago |
Nirothipan
|
939a770c29
|
replacing with single imports
|
7 years ago |
Nirothipan
|
a90658b5e7
|
code formatting
|
7 years ago |
Nirothipan
|
8ce3b6a8c3
|
code formatting
|
7 years ago |
Nirothipan
|
989248e711
|
adding file Name parameter
|
7 years ago |
Nirothipan
|
9432e498e9
|
adding file Name parameter
|
7 years ago |
Nirothipan
|
ac834fbe59
|
adding file Name parameter
|
7 years ago |
Nirothipan
|
56384bcc53
|
modifying form parameters
|
7 years ago |
Nirothipan
|
7ed6552a57
|
adding form parameters
|
7 years ago |
Nirothipan
|
704f511964
|
Adding initial file transfer feature
|
7 years ago |
lasantha
|
b035321def
|
fixes wso2/product-iots/#1266
|
7 years ago |
Harshan Liyanage
|
2b671443fa
|
Merge pull request #714 from hasuniea/master
Windows enrollment issue was resolved from wso2/product-iots#1029
|
8 years ago |
Hasunie
|
2dc23d0574
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
ayyoob
|
d1500dcd6d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
|
8 years ago |
Rasika Perera
|
13d777ff71
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing
|
8 years ago |
Hasunie
|
592d6e7085
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
ayyoob
|
fd369d55de
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
|
8 years ago |
Harshan Liyanage
|
ed28a72483
|
Prevented getDevice calls from loading uncessary device-info.
|
8 years ago |
Rasika Perera
|
dcbf9f30b0
|
Removed publishing into org.wso2.android.agent.Stream
|
8 years ago |
Hasunie
|
30eb8ca91d
|
adding debug logs to GlobalThrowableMapper
|
8 years ago |
ayyoob
|
8381070bf6
|
Implemented Pull Notification Support
|
8 years ago |
ayyoob
|
94d626ca3c
|
changed event definition
|
8 years ago |
kamidu
|
103b795a86
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
kamidu
|
0c1ff01697
|
chaning the notification msg
|
8 years ago |
Rasika Perera
|
51a613f167
|
Resolving #642 : Improve UX on location updates for Android
(cherry picked from commit 64b1b33 )
|
8 years ago |
sameera910409
|
d907f1bc51
|
fix https://wso2.org/jira/browse/EMM-1880
|
8 years ago |
Harshan Liyanage
|
bd2ded8563
|
Removed unnecessary braces.
|
8 years ago |
Hasunie
|
809a30fc7a
|
fixing code format issue
|
8 years ago |
Hasunie
|
7de234c164
|
resolved #616
|
8 years ago |
Hasunie
|
143569b83b
|
Fixing null property in AndriodAPIUtils
|
8 years ago |
sameera910409
|
078209347a
|
refactor code for firebase cloud messaging
|
8 years ago |
Susinda Perera
|
fb6cfb6699
|
Merge pull request #1 from susinda/cloud-3.1.0
Merging from Cloud 3.1.0
|
8 years ago |
Hasunie
|
3e50f0b737
|
adding initial operations
|
8 years ago |
susinda
|
5ad6dc1f1d
|
Fxing PhoneNumber Serach for android
|
8 years ago |
ayyoob
|
a294c20a2a
|
added device management api to be default
|
8 years ago |
Kamidu Sachith Punchihewa
|
68b36babe6
|
Merge pull request #575 from wso2/master
UI fixes for device cloud
|
8 years ago |
charitha
|
9bf38af4f7
|
Fix issues in swagger docs
|
8 years ago |
ayyoob
|
9d64fd0d4b
|
fixed multi tenant login issue
|
8 years ago |
ayyoob
|
466c2b1151
|
moved to gateway mode
|
8 years ago |
Milan Perera
|
2eb18e304a
|
Change scope of android configuration
|
8 years ago |
Milan Perera
|
77d1e684f6
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Rasika Perera
|
81c62b3a13
|
Merge pull request #501 from ayyoob/release-3.0.x
made policy manager to be part of device mgt service
|
8 years ago |
inoshperera
|
7da5ae239b
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
inoshperera
|
22a58121d2
|
changing the Andrid API tag to standerdise
|
8 years ago |
Milan Perera
|
86aac810ce
|
Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x
|
8 years ago |
Milan Perera
|
d2d912fb6d
|
Refactored scopes strings
|
8 years ago |
ayyoob
|
f603f58fd1
|
moved compliance payload generation code to api impl
|
8 years ago |
Maninda
|
0c7f1adcba
|
Fixed some issues reported with FindBugs while security plugin is enabled.
|
8 years ago |
ayyoob
|
54011d2197
|
removed provider tenant domain and user from the web.xml
|
8 years ago |
ayyoob
|
3fa679a3e9
|
made policy manager to be part of device type mgt service
|
8 years ago |
Madawa Soysa
|
1b56ebb831
|
Improving scope annotations in android plugin
|
8 years ago |
charitha
|
a4841d87ba
|
Add custom email template for android
|
8 years ago |
charitha
|
0c2465d03e
|
Add enrollment invitations API EP for android
|
8 years ago |
Harshan Liyanage
|
559fa3fe38
|
Resolved conflicts
|
8 years ago |
inoshperera
|
3b867a533d
|
fixing http status code
|
8 years ago |
inoshperera
|
d9a449dd26
|
adding modify enrollment capability to save chnages in enrollment such as GCM token update
|
8 years ago |
Harshan Liyanage
|
242253b8f2
|
Merge pull request #391 from shavidissa/master
Added swagger annotations and refined the messages
|
8 years ago |
Shavindri
|
f6c0aeecfc
|
Added swagger annotations and refined the messages
|
8 years ago |
Megala
|
e23ecc5b64
|
Fixing EMM-1779
|
8 years ago |
hasuniea
|
2ad390b877
|
removing duplicate event related classes
|
8 years ago |
harshanl
|
fd82cfcddd
|
Added new agent with policy fix
|
8 years ago |
charitha
|
975fb078b5
|
(cherry picked from commit d68c4c8)
|
8 years ago |
charitha
|
9886e2e75f
|
Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt-plugins into carbon-kernel-4.4.3
# Conflicts:
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/bean/ApplicationInstallation.java
(cherry picked from commit 257d6cd)
|
8 years ago |
charitha
|
ba2acb5e75
|
Refactor code
(cherry picked from commit 01f2a91)
|
8 years ago |
harshanl
|
212dcae8e7
|
Added scheduled time to App-install operation
|
8 years ago |
dilanua
|
215093b9a8
|
Updating android operation failure notification message format
|
8 years ago |
Chatura Dilan Perera
|
7174945f21
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
8 years ago |
Chatura Dilan Perera
|
ae99d189e7
|
Fixed logcat and events get APIs
|
8 years ago |
dilanua
|
b99529d9d0
|
Fixing JIRA: https://wso2.org/jira/browse/EMM-1588
|
8 years ago |
dilanua
|
13d784009c
|
Updating android operation failure notification message
|
8 years ago |
dilanua
|
4a78cd6ece
|
Updating android permissions
|
8 years ago |
dilanua
|
19b6a334ad
|
Changing permissions - /device-mgt/configurations to /device-mgt/platform-configurations
|
8 years ago |
dilanua
|
8d338a584b
|
Changing permissions - /devices/owning to /devices/owning-device
|
8 years ago |
kamidu
|
05f540abf1
|
permission modifications
|
8 years ago |
mharindu
|
cbae4e207d
|
Implemented permission based authorization
|
8 years ago |
charitha
|
bfba008218
|
Removed url from application uninstall
(cherry picked from commit 45a582e)
|
8 years ago |
charitha
|
07c7f2b6ff
|
Add validation to APK type
(cherry picked from commit 9da85ad)
|
8 years ago |