Commit Graph

2348 Commits

Author SHA1 Message Date
Rasika Perera
46494c0d74 Merge pull request #502 from dunithd/release-3.0.x
Adding Geo Dashboard link for Arduino and RaspberryPi devices
2017-01-06 14:17:21 +05:30
Rasika Perera
81c62b3a13 Merge pull request #501 from ayyoob/release-3.0.x
made policy manager to be part of device mgt service
2017-01-06 14:15:23 +05:30
Hasunie
0a5cafd6ef fixing windows device view 2017-01-06 14:14:25 +05:30
Hasunie
223a973cda adding Windows 10 location support 2017-01-06 14:12:14 +05:30
Rasika Perera
227ab120a7 Merge pull request #503 from inoshperera/release-3.0.x
Release 3.0.x
2017-01-06 11:57:35 +05:30
inoshperera
7da5ae239b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 11:38:41 +05:30
inoshperera
22a58121d2 changing the Andrid API tag to standerdise 2017-01-06 11:38:09 +05:30
dunithd
cff23fe7aa Adding Geo Dashboard link for Arduino and RaspberryPi devices 2017-01-06 11:11:22 +05:30
Milan Perera
86aac810ce Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 10:11:16 +05:30
Milan Perera
d2d912fb6d Refactored scopes strings 2017-01-06 10:10:45 +05:30
Rasika Perera
05f01329b9 Merge pull request #500 from dunithd/release-3.0.x
Adding Geo Dashboard link to device view page
2017-01-06 10:04:00 +05:30
ayyoob
f603f58fd1 moved compliance payload generation code to api impl 2017-01-05 22:06:37 +05:30
dunithd
7dc5a2000d Adding Geo Dashboard link to device view page 2017-01-05 21:23:34 +05:30
Maninda
0c7f1adcba Fixed some issues reported with FindBugs while security plugin is enabled. 2017-01-05 19:36:52 +05:30
ayyoob
54011d2197 removed provider tenant domain and user from the web.xml 2017-01-05 17:57:04 +05:30
ayyoob
55d200514b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-05 17:55:17 +05:30
Chatura Dilan
7aba0fe551 Merge pull request #499 from rasika/release-3.0.x
Changing title into [WSO2 IoT Server]
2017-01-05 17:31:08 +05:30
Rasika Perera
04fcb0a0e3 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-05 17:19:27 +05:30
Rasika Perera
4fa044357b Replaced [Enterprise Mobility Manager] with [WSO2 IoT Server] 2017-01-05 17:16:31 +05:30
Chatura Dilan
4f486ab633 Merge pull request #498 from madhawap/release-3.0.x
android sense fixes
2017-01-05 17:03:23 +05:30
madhawap
0aab12b1b2 android sense fixes 2017-01-05 16:59:04 +05:30
Chatura Dilan
9a0bbfcdce Merge pull request #497 from rasika/release-3.0.x
Fixing https://wso2.org/jira/browse/IOTS-362
2017-01-05 16:49:37 +05:30
Menaka Jayawardena
a0646ff1ee Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-05 16:40:38 +05:30
ayyoob
3fa679a3e9 made policy manager to be part of device type mgt service 2017-01-05 14:37:27 +05:30
Madawa Soysa
855162c028 Improving scope annotations in windows plugin 2017-01-05 14:30:33 +05:30
Madawa Soysa
1b56ebb831 Improving scope annotations in android plugin 2017-01-05 14:26:43 +05:30
Milan Perera
8a384a6664 Updated to APIM latest snapshot version 2017-01-05 11:21:51 +05:30
Rasika Perera
f3588c7951 config.json [usernameLength] moved to [userValidationConfig][usernameLength] 2017-01-04 22:28:12 +05:30
Rasika Perera
2550096cea config.json [apimgt-gateway] renamed to [gatewayEnabled] 2017-01-04 22:15:01 +05:30
Rasika Perera
838223c67a Removed unneccesary configs 2017-01-04 00:18:28 +05:30
Milan Perera
a05acad85e Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-03 15:08:13 +05:30
sinthuja
29cff5ae8a fixing the ip resolving issue. 2017-01-03 13:31:30 +05:30
Milan Perera
45162ac155 Fixed conflicts and merged 2017-01-03 10:43:55 +05:30
Ruwan
ed24a2fff0 Merge pull request #496 from GPrathap/release-3.0.x
remove hardcoded oauth2 token
2017-01-03 08:28:57 +05:30
GPrathap
809992fb9f remove hardcoded oauth2 token 2017-01-02 15:33:01 +05:30
Menaka Jayawardena
c273fd4d0a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-02 12:25:33 +05:30
Rasika Perera
ff5659ec1a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-25 02:16:11 +05:30
Rasika Perera
c7d9c167d1 Upgrading version of CDMF 2016-12-25 02:15:38 +05:30
Rasika Perera
ea61cb5799 Merge pull request #495 from wso2/release-3.0.4
Release 3.0.4
2016-12-24 23:09:35 +05:30
WSO2 Builder
227d4685c9 [maven-release-plugin] prepare for next development iteration 2016-12-24 03:15:18 +00:00
WSO2 Builder
6c38ce6385 [maven-release-plugin] prepare release v3.0.4 2016-12-24 03:13:35 +00:00
Rasika Perera
58bb6eb2bd Upgrading version of CDMF 2016-12-24 07:41:36 +05:30
Rasika Perera
c035568cb4 Upgrading cdmf version 2016-12-23 15:14:34 +05:30
Menaka Jayawardena
951acdd59a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-23 12:27:14 +05:30
Charitha Goonetilleke
f38d5f6d20 Merge pull request #494 from ruwany/release-3.0.x
Migrating appm/apim/identity/registry/governance to latest versions
2016-12-23 10:03:52 +05:30
Ace
c302d7b25a Coorecting version import ranges 2016-12-23 09:58:28 +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
Charitha Goonetilleke
a9a30b3e90 Merge pull request #492 from madhawap/release-3.0.x
Task operation config related changes
2016-12-22 18:29:13 +05:30
madhawap
4de0aab701 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-22 17:55:06 +05:30