Commit Graph

2253 Commits

Author SHA1 Message Date
WSO2 Builder
4ae70fe1f1 [maven-release-plugin] prepare for next development iteration 2016-11-29 10:24:35 +00:00
WSO2 Builder
42c2b04c62 [maven-release-plugin] prepare release v2.2.7 2016-11-29 10:12:05 +00:00
Harshan Liyanage
3787ae1431 Merge pull request #431 from wso2/release-2.2.6
Updating component versions after release.
2016-11-29 15:34:08 +05:30
inoshperera
48c034f6ec Merge pull request #430 from harshanL/master
Updated android agent apk
2016-11-29 15:26:48 +05:30
Harshan Liyanage
3673e38274 Updated android agent apk 2016-11-29 15:24:39 +05:30
WSO2 Builder
ab087bf934 [maven-release-plugin] prepare for next development iteration 2016-11-29 07:23:41 +00:00
WSO2 Builder
072dd089ef [maven-release-plugin] prepare release v2.2.6 2016-11-29 07:21:29 +00:00
Harshan Liyanage
00607eb743 Updated carbon-device-mgt version to released version. 2016-11-29 12:42:30 +05:30
Harshan Liyanage
4898a38775 Merge pull request #429 from hasuniea/release-3.0.x
adding windows qr-code scanner
2016-11-29 11:32:04 +05:30
Hasunie
1038c23c98 adding windows qr-code scanner 2016-11-29 11:24:22 +05:30
Hasunie
a40d508251 Merge pull request #428 from harshanL/master
Added latest android agent
2016-11-29 10:41:30 +05:30
Harshan Liyanage
02baf19cc7 Added latest android agent 2016-11-29 10:35:14 +05:30
inoshperera
a9ca9cf352 adding a fix for web app user retrival. 2016-11-28 22:36:48 +05:30
Madawa Soysa
ea7da0724f IOTS-296: Generalizing policy UI for Android device type
This commit includes moving policy flow device type specific client side logic and UI components to the android plugin.
2016-11-28 16:45:10 +05:30
inoshperera
c36681baac Fixing the issue of duplicate application operations being set to the same device. 2016-11-28 16:18:46 +05:30
dilanua
4e001afef2 Changing emm device statistics menu item to work with relative path 2016-11-28 15:19:35 +05:30
sinthuja
0cf52a7b5e Adding the geo fence first cut impl. 2016-11-28 00:58:36 +05:30
Geeth
44cd2d6b8d Merge pull request #425 from geethkokila/master
Fixing the app manager issue by calling the correct getDevices method
2016-11-27 07:45:58 +05:30
geethkokila
b7f3691d90 Fixing the app manager issue by calling the correct getDevices method 2016-11-27 07:40:44 +05:30
dilanua
6de9925198 Changing EMM device statistics menu icon 2016-11-26 09:29:24 +05:30
dilanua
9fb5c3fd93 Fixes to JIRA: https://wso2.org/jira/browse/EMM-1845 2016-11-26 08:30:54 +05:30
Harshan Liyanage
5b52f5f635 Merge pull request #424 from Megala21/master
Fixing problems in displaying operation bar for ios
2016-11-25 17:11:42 +05:30
Megala
7b3be4294e Fixing problems in displaying operation bar for ios 2016-11-25 15:49:10 +05:30
ching
074e500cda Corrected spelling mistakes in the UI 2016-11-25 15:28:00 +05:30
ching
c8315101c3 Corrected spelling mistakes in the UI 2016-11-25 15:23:59 +05:30
charitha
a3dd52d38d Update carbon-device-mgt version to latest development version. 2016-11-25 15:01:17 +05:30
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