charitha
|
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
|
2018-10-30 15:55:38 +05:30 |
|
charitha
|
8cdf53b03f
|
Enable FCM by default
|
2018-10-23 18:39:23 +05:30 |
|
charitha
|
b218591e19
|
Enable FCM by default
|
2018-10-08 11:31:53 +05:30 |
|
charitha
|
4e52117f21
|
Update license text of enrollment
|
2018-10-08 11:16:46 +05:30 |
|
Milan Perera
|
3b57b9a9fb
|
Whitelabel devic types
|
2018-09-27 11:25:37 +05:30 |
|
geethkokila
|
adaadff7f3
|
Fixing the initial configuration issue
Fixing the https://github.com/wso2/product-iots/issues/1425, Initial configurations are wrongly put on the device type xml files
|
2018-01-23 14:46:17 +05:30 |
|
charitha
|
578bda6e3b
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2018-01-10 11:01:55 +05:30 |
|
charitha
|
0a08afa083
|
Fixed https://github.com/wso2/product-iots/issues/1572
|
2018-01-10 11:01:22 +05:30 |
|
Rasika Perera
|
80de89c8c1
|
https://github.com/wso2/product-iots/issues/1573 Removed android-web-agent, Fixed download URL
|
2018-01-09 20:06:50 +05:30 |
|
lasantha
|
4a62a05cb9
|
Adding new API version for backward compatibility
|
2017-12-12 18:20:36 +05:30 |
|
Nirothipan
|
5aea03c66f
|
reordering operations
|
2017-10-18 11:31:54 +05:30 |
|
Nirothipan
|
5049f17b6d
|
androif file transfer feature
|
2017-08-28 13:33:10 +05:30 |
|
Ace
|
0cfa757c0a
|
Fixing stats display issue for virtual fire-alarm in MT mode
|
2017-08-22 16:25:24 +05:30 |
|
ayyoob
|
61a3455ec5
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
|
2017-06-22 04:51:41 +05:30 |
|
Harshan Liyanage
|
a07d676936
|
Increased timeouts for device status task.
|
2017-06-20 16:54:50 +05:30 |
|
ayyoob
|
d1500dcd6d
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
|
2017-06-17 19:31:22 +05:30 |
|
ayyoob
|
7117fdeafc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into devicetype-3.1.0
Conflicts:
pom.xml
|
2017-06-16 03:47:46 +05:30 |
|
Rasika Perera
|
4713448c4f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into geo-fencing
|
2017-06-12 15:14:08 +05:30 |
|
Harshan Liyanage
|
b3ddc12709
|
Added comments to the device status task configs.
|
2017-06-07 17:35:03 +05:30 |
|
Rasika Perera
|
7aa2cfde67
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
|
2017-06-05 10:30:32 +05:30 |
|
Rasika Perera
|
870073eda2
|
Removed deviceType specific streams, All should use IoT Location stream
|
2017-06-05 10:17:03 +05:30 |
|
Harshan Liyanage
|
ea5c865826
|
Resolves harshanl/product-iots#518
|
2017-05-30 17:09:44 +05:30 |
|
ayyoob
|
edd3d6efee
|
removed duplicate line
|
2017-05-05 09:09:43 +05:30 |
|
ayyoob
|
359184429e
|
Added missing fixes that was done for multi tenancy in cloud branch
|
2017-05-05 01:57:48 +05:30 |
|
Amal Gunatilake
|
ddc1e8bef4
|
Merge pull request #663 from janakamarasena/master
Add synapse configs to handle mutual ssl auth for android
|
2017-05-02 20:28:37 +05:30 |
|
Janak Amarasena
|
67510b007f
|
Removed unwanted handlers
|
2017-05-02 17:02:53 +05:30 |
|
warunalakshitha
|
568538cc13
|
add comments for performance configs
|
2017-04-30 13:58:49 +05:30 |
|
Janak Amarasena
|
7db99295f5
|
Add synapse configs to handle mutual ssl auth for android
|
2017-04-28 16:58:21 +05:30 |
|
sameera910409
|
078209347a
|
refactor code for firebase cloud messaging
|
2017-03-13 14:30:27 +05:30 |
|
Susinda
|
f96389e671
|
Android agent downloadded from github relese location, Hasuni's fix on initial operations added
|
2017-03-10 12:00:27 +05:30 |
|
Rasika Perera
|
7f7256eac4
|
Fixing carbon apps not getting deployed
|
2017-02-23 15:10:06 +05:30 |
|
ayyoob
|
dd3017578a
|
added artefact deployment support for device types
|
2017-02-05 17:52:52 +05:30 |
|
ayyoob
|
3fa679a3e9
|
made policy manager to be part of device type mgt service
|
2017-01-05 14:37:27 +05:30 |
|
Ruwan
|
dd9e04e75d
|
Merge pull request #493 from charithag/release-3.0.x-email-invites
Release 3.0.x email invites
|
2016-12-22 18:38:51 +05:30 |
|
charitha
|
a4841d87ba
|
Add custom email template for android
|
2016-12-22 18:31:05 +05:30 |
|
madhawap
|
77b5d2422c
|
Task operation config related changes
|
2016-12-22 17:53:47 +05:30 |
|
charitha
|
0c2465d03e
|
Add enrollment invitations API EP for android
|
2016-12-20 23:48:21 +05:30 |
|
madhawap
|
6618b919d1
|
Adding separate tasks to carry out device monitoring for each device type
|
2016-12-08 17:40:43 +05:30 |
|
sinthuja
|
f23fd9c85f
|
Merge branch 'android-sense-agent-fixes' into release-3.0.x
|
2016-12-07 11:00:49 +05:30 |
|
Megala
|
4bfd9a72b6
|
Adding siddhi extension and analytics for android-agent
|
2016-12-06 17:18:20 +05:30 |
|
Ace
|
3dd59ed250
|
Adding changes to descriptor and ui changes
|
2016-12-06 13:31:41 +05:30 |
|
Ace
|
749f680dad
|
Adding missed configurations
|
2016-12-05 10:42:01 +05:30 |
|
Ace
|
8a96aa204c
|
Adding generalizations to android-operations bar
|
2016-12-05 10:35:40 +05:30 |
|
madhawap
|
429b52f037
|
resolve conflicts
|
2016-12-01 16:04:43 +05:30 |
|
madhawap
|
3249079965
|
Seperate out task operations
|
2016-12-01 15:41:07 +05:30 |
|
Ace
|
ea14e32337
|
Adding android-web-agent
|
2016-11-11 10:05:12 +05:30 |
|
Chatura Dilan
|
557706e99c
|
Added android features to the descriptor
|
2016-11-09 14:13:51 +05:30 |
|
ayyoob
|
dedcf3b858
|
added correct db
|
2016-11-08 23:40:43 +05:30 |
|
Chatura Dilan
|
3b721cfc6c
|
Fixed android descriptor
|
2016-11-08 18:22:44 +05:30 |
|
Ayyoob Hamza
|
86ea0cae89
|
Merge pull request #402 from ruwany/st2
Adding windows/android datasources
|
2016-11-08 17:29:49 +05:30 |
|