Commit Graph

2480 Commits

Author SHA1 Message Date
WSO2 Builder
bfa2c5fa61 [maven-release-plugin] prepare for next development iteration 2016-11-25 09:14:26 +00:00
WSO2 Builder
09d434bda9 [maven-release-plugin] prepare release v3.0.1 2016-11-25 09:11:13 +00:00
charitha
125f7f35f7 Update carbon-device-mgt version 2016-11-25 14:42:27 +05:30
Charitha Goonetilleke
cd30635715 Merge pull request #422 from DimalChandrasiri/IoTS-1.0.0
Changes for IoT build
2016-11-25 11:00:44 +05:30
inoshperera
c92f7f3520 Merge pull request #421 from Megala21/master
Removing the sender id
2016-11-25 09:49:53 +05:30
Megala
6c9c4a15fd Removing the sender id 2016-11-25 09:44:23 +05:30
sinthuja
4da1d5ec3a Adding JSON message format support for secure-websocket. 2016-11-25 00:08:09 +05:30
Dilan U. Ariyaratne
0f17b2e766 Merge pull request #420 from GPrathap/IoTS-1.0.0
added android sense analytics scripts
2016-11-24 19:02:19 +05:30
GPrathap
dca34e7fb3 added cron expression 2016-11-24 18:46:16 +05:30
Imesh Chandrasiri
bc075dedf0 Changes for IoT build 2016-11-24 18:29:35 +05:30
inoshperera
78232cd34c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-11-24 16:09:04 +05:30
inoshperera
18c0760ba5 Changing gcm endpoint to fcm 2016-11-24 16:08:48 +05:30
Hasunie
ab3e31f432 Merge pull request #419 from harshanL/master
Added security filters to emm-web-agent app
2016-11-24 14:08:33 +05:30
Harshan Liyanage
e1afb5bcdc Merge branch 'master' of https://github.com/wso1/carbon-device-mgt-plugins 2016-11-24 13:40:06 +05:30
inoshperera
3b867a533d fixing http status code 2016-11-24 12:46:33 +05:30
Harshan Liyanage
6cc3f39dd3 Added security filters to emm-web-agent app 2016-11-24 12:36:36 +05:30
GPrathap
dd86f91de6 moved from org.wso2.carbon.device.mgt.iot.androidsense.analytics2 2016-11-23 23:49:51 +05:30
inoshperera
d9a449dd26 adding modify enrollment capability to save chnages in enrollment such as GCM token update 2016-11-23 12:36:05 +05:30
inoshperera
9a66b8a693 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-11-23 12:10:16 +05:30
Ruwan
1ff609d819 Merge pull request #416 from ayyoob/IoTS-1.0.0
refactored device verification
2016-11-22 15:59:26 +05:30
Ruwan
0ecd669d08 Merge pull request #417 from harshanL/master
Updated platform component versions.
2016-11-22 14:23:33 +05:30
Harshan Liyanage
8e81376183 Reverted test commit 2016-11-22 13:56:38 +05:30
Harshan Liyanage
c6b448d977 Updated registry, governance and deployment versions 2016-11-22 13:55:03 +05:30
ayyoob
cf5525dc3f removed device type and feature annotation 2016-11-21 20:55:12 +05:30
ayyoob
d6bfce396d Merge branch 'IoTS-1.0.0' of https://github.com/wso2/carbon-device-mgt-plugins into IoTS-1.0.0 2016-11-21 19:18:32 +05:30
ayyoob
c7a29f0637 few changes in coding issues 2016-11-21 19:14:21 +05:30
sinthuja
cf1782391f Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0 2016-11-21 17:10:28 +05:30
sinthuja
d3d176ebdc fixing some issues in the andriod analytics carbon apps. 2016-11-21 17:10:10 +05:30
Harshan Liyanage
8c60c81b00 Merge pull request #415 from ruwany/st2
Adding windows-web-agent
2016-11-21 14:52:33 +05:30
inoshperera
b027f5dbe9 adding a button and connection to ios factory reset backend API 2016-11-21 11:53:33 +05:30
Ace
f3de1cf85e Adding windows-web-agent 2016-11-21 11:15:30 +05:30
Harshan Liyanage
f6032004fb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-11-21 09:50:37 +05:30
dilanua
1cce94cef9 Fixing operation button stuck issue 2016-11-20 22:31:27 +05:30
Dilan U. Ariyaratne
3f476eac9f Merge pull request #414 from GPrathap/IoTS-1.0.0
removed @API and @Permission annotations
2016-11-20 19:32:32 +05:30
GPrathap
3d971d2bb7 removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations 2016-11-20 19:04:11 +05:30
dilanua
861c5f861e Updating device statistics menu item url 2016-11-20 12:09:59 +05:30
dilanua
dbeedf246b Adding deviceStatisticsEnabled property to check visibility of device-statistics menu item 2016-11-20 10:55:56 +05:30
ayyoob
bfb9c62968 changed device access verification approach 2016-11-20 02:37:42 +05:30
dilanua
edd400bde4 Changing menu item names 2016-11-18 19:54:59 +05:30
Ruwan
93ed31c584 Merge pull request #413 from ayyoob/IoTS-1.0.0
changes in operation bar and deployer files
2016-11-18 16:52:08 +05:30
ayyoob
68f1fb34fe changes in operation bar and deployer.xml 2016-11-17 23:33:26 +05:30
sinthuja
f3fc531a53 Adding the new version of android analytics carbon apps. 2016-11-17 22:51:54 +05:30
sinthuja
722593a51f Making autoVersionSubmodules enabled to avoid the necessity of giving the versions seperately for sub modules. 2016-11-17 10:43:40 +05:30
Charitha Goonetilleke
af33eb4afe Merge pull request #412 from wso2/release-3.0.0
Release 3.0.1
2016-11-16 19:48:01 +05:30
WSO2 Builder
61ca4c4900 [maven-release-plugin] prepare for next development iteration 2016-11-16 13:57:06 +00:00
WSO2 Builder
4746bf0c74 [maven-release-plugin] prepare release v3.0.0 2016-11-16 13:55:17 +00:00
charitha
3190ae0986 Update analytics version 2016-11-16 18:55:15 +05:30
charitha
7f8047b54b Update cdmf component versions to released version 2016-11-16 18:50:26 +05:30
Ace
ae33d236fa Adding android device-view changes 2016-11-16 15:43:23 +05:30
Ace
7e3df67548 Adding android-base-plugin 2016-11-16 15:07:44 +05:30