Charitha Goonetilleke
|
ab40b7b6b8
|
Merge remote-tracking branch 'entgra/master' into entgra-master
|
6 years ago |
Charitha Goonetilleke
|
6fdbfe2497
|
Update devicemgt core version to latest
|
6 years ago |
Saad Sahibjan
|
8355861083
|
Enrollment application install feature for policy
|
6 years ago |
Charitha Goonetilleke
|
618cc1b854
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master
# Conflicts:
# components/analytics/iot-analytics/org.wso2.carbon.device.mgt.cdmf.analytics/pom.xml
# components/analytics/iot-analytics/org.wso2.carbon.device.mgt.iot.analytics/pom.xml
# components/analytics/iot-analytics/org.wso2.carbon.iot.device.statistics.dashboard/pom.xml
# components/analytics/iot-analytics/org.wso2.carbon.iot.geo.dashboard/pom.xml
# components/analytics/iot-analytics/pom.xml
# components/analytics/pom.xml
# components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.analytics/pom.xml
# components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.api/pom.xml
# components/device-types/androidsense-plugin/org.wso2.carbon.device.mgt.iot.androidsense.ui/pom.xml
# components/device-types/androidsense-plugin/pom.xml
# components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.analytics/pom.xml
# components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.api/pom.xml
# components/device-types/arduino-plugin/org.wso2.carbon.device.mgt.iot.arduino.ui/pom.xml
# components/device-types/arduino-plugin/pom.xml
# components/device-types/pom.xml
# components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics/pom.xml
# components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.api/pom.xml
# components/device-types/raspberrypi-plugin/org.wso2.carbon.device.mgt.iot.raspberrypi.ui/pom.xml
# components/device-types/raspberrypi-plugin/pom.xml
# components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.agent.impl/pom.xml
# components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics/pom.xml
# components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.api/pom.xml
# components/device-types/virtual-fire-alarm-plugin/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui/pom.xml
# components/device-types/virtual-fire-alarm-plugin/pom.xml
# components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.osgiconnector/pom.xml
# components/extensions/appm-connector/org.wso2.carbon.appmgt.mdm.restconnector/pom.xml
# components/extensions/appm-connector/pom.xml
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.extension/pom.xml
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.http/pom.xml
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/pom.xml
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.thrift/pom.xml
# components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.xmpp/pom.xml
# components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.http/pom.xml
# components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.mqtt/pom.xml
# components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket.endpoint/pom.xml
# components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.websocket/pom.xml
# components/extensions/cdmf-transport-adapters/output/org.wso2.carbon.device.mgt.output.adapter.xmpp/pom.xml
# components/extensions/cdmf-transport-adapters/pom.xml
# components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.api/pom.xml
# components/extensions/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/pom.xml
# components/extensions/mb-extensions/pom.xml
# components/extensions/pom.xml
# components/extensions/pull-notification-listeners/org.wso2.carbon.device.mgt.mqtt.notification.listener/pom.xml
# components/extensions/pull-notification-listeners/pom.xml
# components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session.endpoint/pom.xml
# components/extensions/remote-session-extension/org.wso2.carbon.device.mgt.extensions.remote.session/pom.xml
# components/extensions/remote-session-extension/pom.xml
# components/extensions/siddhi-extensions/org.wso2.extension.siddhi.device/pom.xml
# components/extensions/siddhi-extensions/org.wso2.extension.siddhi.execution.json/pom.xml
# components/extensions/siddhi-extensions/org.wso2.gpl.siddhi.extension.geo.script/pom.xml
# components/extensions/siddhi-extensions/pom.xml
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/pom.xml
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/pom.xml
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/pom.xml
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/android-agent.apk
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/pom.xml
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.v09.api/src/test/java/org/wso2/carbon/mdm/services/android/mocks/DeviceManagementProviderServiceMock.java
# components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android/pom.xml
# components/mobile-plugins/android-plugin/pom.xml
# components/mobile-plugins/pom.xml
# components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.api/pom.xml
# components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows.ui/pom.xml
# components/mobile-plugins/windows-plugin/org.wso2.carbon.device.mgt.mobile.windows/pom.xml
# components/mobile-plugins/windows-plugin/pom.xml
# components/test-coverage/pom.xml
# features/analytics-feature/org.wso2.carbon.device.mgt.cdmf.analytics.feature/pom.xml
# features/analytics-feature/org.wso2.carbon.device.mgt.iot.analytics.feature/pom.xml
# features/analytics-feature/org.wso2.carbon.iot.device.statistics.dashboard.feature/pom.xml
# features/analytics-feature/org.wso2.carbon.iot.geo.dashboard.feature/pom.xml
# features/analytics-feature/pom.xml
# features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.analytics.feature/pom.xml
# features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml
# features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.ui.feature/pom.xml
# features/device-types-feature/androidsense-plugin-feature/pom.xml
# features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.analytics.feature/pom.xml
# features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.backend.feature/pom.xml
# features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.ui.feature/pom.xml
# features/device-types-feature/arduino-plugin-feature/pom.xml
# features/device-types-feature/pom.xml
# features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.analytics.feature/pom.xml
# features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.backend.feature/pom.xml
# features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/pom.xml
# features/device-types-feature/raspberrypi-plugin-feature/pom.xml
# features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.analytics.feature/pom.xml
# features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.backend.feature/pom.xml
# features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/pom.xml
# features/device-types-feature/virtual-fire-alarm-plugin-feature/pom.xml
# features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.api.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.appmgt.mdm.osgiconnector.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.appmgt.mdm.restconnector.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.device.mgt.adapter.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.device.mgt.notification.listener.feature/pom.xml
# features/extensions-feature/org.wso2.carbon.device.mgt.remote.session.feature/pom.xml
# features/extensions-feature/org.wso2.extension.siddhi.device.feature/pom.xml
# features/extensions-feature/org.wso2.extension.siddhi.execution.json.feature/pom.xml
# features/extensions-feature/org.wso2.gpl.siddhi.extension.geo.script.feature/pom.xml
# features/extensions-feature/pom.xml
# features/mobile-plugins-feature/android-plugin-feature/org.wso2.carbon.device.mgt.mobile.android.feature/pom.xml
# features/mobile-plugins-feature/android-plugin-feature/pom.xml
# features/mobile-plugins-feature/pom.xml
# features/mobile-plugins-feature/windows-plugin-feature/org.wso2.carbon.device.mgt.mobile.windows.feature/pom.xml
# features/mobile-plugins-feature/windows-plugin-feature/pom.xml
# pom.xml
|
6 years ago |
Charitha Goonetilleke
|
6fbc4e1def
|
Fixed test failure
|
6 years ago |
Charitha Goonetilleke
|
f69c1ba0c7
|
Bump devicemgt version
|
6 years ago |
lasanthaDLPDS
|
4e30859563
|
Fix device type deploying issue
|
6 years ago |
Charitha Goonetilleke
|
5bbb45ce84
|
Fixed issue in device type config operation
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
|
6 years ago |
Charitha Goonetilleke
|
211391fb02
|
Fixed issue in device type config operation
- Device type config operation throws invalid device identifieres exception when changing configurations without having active devices
|
6 years ago |
Charitha Goonetilleke
|
5996ddb5e1
|
Merge branch 'master' into 'master'
Whitelabel device types
See merge request entgra/carbon-device-mgt-plugins!2
|
6 years ago |
charitha
|
a113b4bdba
|
Updated device-mgt version
|
6 years ago |
Milan Perera
|
3b57b9a9fb
|
Whitelabel devic types
|
6 years ago |
inoshperera
|
44228ba37c
|
fixing build brake
|
6 years ago |
charitha
|
f1607f868d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into entgra-master
# Conflicts:
# pom.xml
|
6 years ago |
shagihan
|
1aeede731f
|
Fixing code formatting.
|
6 years ago |
shagihan
|
058cb22358
|
Formating fixes
|
6 years ago |
shagihan
|
c3a92664fc
|
Updates polling period of android devices by an API call.
|
6 years ago |
charitha
|
99054e1e77
|
Prevent duplicate alerts & added owner field
|
6 years ago |
charitha
|
7766055d17
|
Update geo location API
|
6 years ago |
geethkokila
|
6882a560bc
|
Fixing the error in event publishing
This is error occurrs when the event publishing cause and error, it does not print any log.
|
7 years ago |
geethkokila
|
f551a88d2e
|
Fixing the error in event publishing
This is error occurrs when the event publishing cause and error, it does not print any log.
|
7 years ago |
Rasika Perera
|
b5604670c8
|
Merge branch 'master' into fix-1611
|
7 years ago |
Rasika Perera
|
c56bdd5d6b
|
Fixing https://github.com/wso2/product-iots/issues/1611
|
7 years ago |
geethkokila
|
40484b5d6b
|
Updating the carbon-device-mgt version
This upgrade has api changes due to fixes to the policy monitoring
|
7 years ago |
lasantha
|
48fdda4e38
|
adding latest android agent and fixing test failures
|
7 years ago |
Ace
|
d57cb4a3a1
|
Bumping cdmf version and updating unit tests
|
7 years ago |
Gathika94
|
6b6b82e639
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
7 years ago |
charitha
|
82c7eefd2e
|
Fix for https://github.com/wso2/product-iots/issues/1496
|
7 years ago |
Gathika94
|
6bcbf4e5dd
|
minor changes
|
7 years ago |
charitha
|
6828d0ae41
|
Bumping device-mgt-core to latest release
|
7 years ago |
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 |