Commit Graph

1977 Commits

Author SHA1 Message Date
madhawap
a2897012f9 Fix for disabling reboot and upgrade-firmware operations on UI
In order to execute these two operations the enrolled device needs to have the system app installed. Therefore, in order to stop users from trying these two operations on cloud, the icons related to these two operations, on operation bar are disabled.
2017-05-09 12:03:08 +05:30
WSO2 Builder
f0a70d7f27 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare for next development iteration 2017-05-08 18:04:55 +05:30
WSO2 Builder
24460ebde1 [WSO2 Release] [Jenkins #2693] [Release 3.0.33] prepare release v3.0.33 2017-05-08 18:04:39 +05:30
sinthuja
37a15e927d Merge branch 'wso2-master'
# Conflicts:
#	features/device-types-feature/androidsense-plugin-feature/org.wso2.carbon.device.mgt.iot.androidsense.backend.feature/pom.xml
2017-05-08 14:28:07 +05:30
WSO2 Builder
df7df6ffa6 [maven-release-plugin] prepare for next development iteration 2017-05-08 12:44:37 +05:30
WSO2 Builder
3cdec9843a [maven-release-plugin] prepare release v3.0.32 2017-05-08 12:44:22 +05:30
sinthuja
79bdfa642c Merge branch 'wso2-master'
# Conflicts:
#	components/extensions/cdmf-transport-adapters/input/org.wso2.carbon.device.mgt.input.adapter.mqtt/src/main/java/org/wso2/carbon/device/mgt/input/adapter/mqtt/util/MQTTAdapterListener.java
#	features/device-types-feature/arduino-plugin-feature/org.wso2.carbon.device.mgt.iot.arduino.ui.feature/src/main/resources/p2.inf
#	features/device-types-feature/raspberrypi-plugin-feature/org.wso2.carbon.device.mgt.iot.raspberrypi.ui.feature/src/main/resources/p2.inf
#	features/device-types-feature/virtual-fire-alarm-plugin-feature/org.wso2.carbon.device.mgt.iot.virtualfirealarm.ui.feature/src/main/resources/p2.inf
2017-05-07 23:02:06 +05:30
ayyoob
5a25f15d08 removing the fix did in cloud setup - jasinthas 2017-05-05 03:21:13 +05:30
ayyoob
359184429e Added missing fixes that was done for multi tenancy in cloud branch 2017-05-05 01:57:48 +05:30
sinthuja
bbc8c8efce Fixing the issue in consuming the events for carbon.super from mqtt. 2017-05-04 22:15:36 +05:30
WSO2 Builder
2db4069053 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare for next development iteration 2017-05-02 20:47:53 +05:30
WSO2 Builder
902d7e3cf2 [WSO2 Release] [Jenkins #2670] [Release 3.0.31] prepare release v3.0.31 2017-05-02 20:47:39 +05:30
warunalakshitha
543e68771e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2017-05-01 20:53:24 +05:30
WSO2 Builder
e2becd3169 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare for next development iteration 2017-05-01 19:57:06 +05:30
WSO2 Builder
85c36c0ca8 [WSO2 Release] [Jenkins #2666] [Release 3.0.30] prepare release v3.0.30 2017-05-01 19:56:48 +05:30
Rasika Perera
9d00038199 #665 : Added some improvements to the fix 2017-05-01 19:38:16 +05:30
Rasika Perera
f7dbc156b3 #665 : Added some changes to reuse PropertyUtils.replaceTenantDomainProperty() 2017-05-01 19:15:11 +05:30
Rasika Perera
be99ca571b #665 : Fixing java.lang.IllegalStateException: Tenant ID cannot be -1 issue 2017-05-01 18:54:01 +05:30
warunalakshitha
568538cc13 add comments for performance configs 2017-04-30 13:58:49 +05:30
WSO2 Builder
c3fb32f3bc [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare for next development iteration 2017-04-28 10:33:09 +05:30
WSO2 Builder
1b0047c39f [WSO2 Release] [Jenkins #2661] [Release 3.0.29] prepare release v3.0.29 2017-04-28 10:32:49 +05:30
Ayyoob Hamza
5397fc3563 Merge pull request #662 from Megala21/master
Adding security filters for secured-websocket war
2017-04-28 10:05:29 +05:30
WSO2 Builder
99e587eb78 [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare for next development iteration 2017-04-28 08:38:44 +05:30
WSO2 Builder
9b8929a8cd [WSO2 Release] [Jenkins #2659] [Release 3.0.28] prepare release v3.0.28 2017-04-28 08:38:35 +05:30
Kamidu Sachith Punchihewa
6759a99ae9 Merge pull request #657 from rasika/master
Fixing Android policy view and policy edit doesn't honor isCloud enabled param
2017-04-28 07:58:30 +05:30
megala21
d1ee78eaed Adding security filters for websocket web.xml 2017-04-27 17:37:17 +05:30
Rasika Perera
511c61175c #654 : Fixing Android policy view and policy edit doesn't honor isCloud enabled parameter 2017-04-25 14:46:55 +05:30
WSO2 Builder
1a91d1ddc0 [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare for next development iteration 2017-04-25 13:14:01 +05:30
WSO2 Builder
426a016c37 [WSO2 Release] [Jenkins #2654] [Release 3.0.27] prepare release v3.0.27 2017-04-25 13:13:43 +05:30
WSO2 Builder
de5ff24046 Merge commit 'dc4c32129ac05dfe6247cb060cc0949fcdf5c2ed' into db9e6dc2-9fc6-4b4a-8465-9e6ea06cdee0 2017-04-25 12:50:57 +05:30
WSO2 Builder
dc4c32129a [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare for next development iteration 2017-04-25 11:47:30 +05:30
WSO2 Builder
b1c6ae0e2c [WSO2 Release] [Jenkins #2653] [Release 3.0.26] prepare release v3.0.26 2017-04-25 11:47:01 +05:30
charitha
9febce0601 Add latest agent (3.1.16) 2017-04-25 11:32:20 +05:30
Charitha Goonetilleke
186b3e16e4 Merge pull request #653 from ruwany/master
Merging cloud-310 branch with master
2017-04-25 11:29:04 +05:30
WSO2 Builder
72fab84bf9 [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare for next development iteration 2017-04-24 17:57:19 +05:30
WSO2 Builder
5ff67af60a [WSO2 Release] [Jenkins #2650] [Release 3.0.25] prepare release v3.0.25 2017-04-24 17:57:03 +05:30
inoshperera
3fb3ebd893 moving app subscription to a new thread 2017-04-24 17:33:56 +05:30
charitha
de0cb9a5a2 Add agent 3.1.15 for cloud
(cherry picked from commit 0d6800b)
2017-04-24 11:35:25 +05:30
charitha
ab91e3a6b0 Fixed https://github.com/wso2/cdmf-agent-android/issues/33
(cherry picked from commit fadd2e6)
2017-04-24 11:35:18 +05:30
charitha
d80c25ed2b Updating UIs of agents to latest
(cherry picked from commit 90c0618)
2017-04-24 11:35:07 +05:30
Rasika Perera
a1b0298374 Updating android agent into latest
(cherry picked from commit a41436d)
2017-04-24 11:34:37 +05:30
Jasintha
ce4365f601 Removing testing values
(cherry picked from commit 31d5977)
2017-04-24 11:33:46 +05:30
Jasintha
3980899686 Fixing MQTT adpater and analytics resources for androidsense userstory
(cherry picked from commit b04b583)
2017-04-24 11:33:25 +05:30
Rasika Perera
51a613f167 Resolving #642 : Improve UX on location updates for Android
(cherry picked from commit 64b1b33)
2017-04-24 11:24:26 +05:30
WSO2 Builder
4c0e505008 [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare for next development iteration 2017-04-21 16:28:48 +05:30
WSO2 Builder
b653b4871d [WSO2 Release] [Jenkins #2645] [Release 3.0.24] prepare release v3.0.24 2017-04-21 16:28:35 +05:30
amalhub
ec75361c57 Adding latest android-agent.apk (https://github.com/wso2/cdmf-agent-android/releases/tag/v3.1.13) 2017-04-21 14:57:43 +05:30
WSO2 Builder
7a2b64605f [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare for next development iteration 2017-04-18 10:33:01 +05:30
WSO2 Builder
908ee841e9 [WSO2 Release] [Jenkins #2640] [Release 3.0.23] prepare release v3.0.23 2017-04-18 10:32:45 +05:30
ayyoob
310525d066 added token recovery option when token refresh failed 2017-04-17 17:44:38 +05:30