Commit Graph

2282 Commits

Author SHA1 Message Date
Chatura Dilan
c08a2bc0a8 Merge pull request #512 from hasuniea/windows10
Fixing issue in windows admin service tag
2017-01-09 09:35:01 +05:30
Hasunie
9e59993900 fixing issue in admin service tag 2017-01-09 08:25:54 +05:30
Hasunie
b44fccaade Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-09 08:00:51 +05:30
Rasika Perera
ebca70639f Merge pull request #511 from ayyoob/release-3.0.x
IOTS-370 & IOTS-371 & removed scep capability from virtual firealarm
2017-01-09 07:21:08 +05:30
ayyoob
1df7d20a81 moved common configuration to global properties for input and output adapters 2017-01-08 21:26:14 +05:30
Rasika Perera
514f971a21 Updating cdmf version into [2.0.7-SNAPHOT] 2017-01-08 08:21:36 +05:30
ayyoob
4cb6aca5b0 merge with upstream 2017-01-08 01:32:16 +05:30
ayyoob
ccaf47112a removed DCR, added global configuration values for input and output adapter 2017-01-08 01:20:04 +05:30
Rasika Perera
e7aaa1c354 Merge pull request #510 from wso2/release-3.0.5
Release 3.0.5
2017-01-07 22:34:00 +05:30
WSO2 Builder
b10579950b [maven-release-plugin] prepare for next development iteration 2017-01-07 11:25:51 +00:00
WSO2 Builder
b7a5454c2f [maven-release-plugin] prepare release v3.0.5 2017-01-07 11:22:33 +00:00
Rasika Perera
8c4dee7c2f Updating cdmf version into 2.0.6 2017-01-07 15:40:21 +05:30
ayyoob
2e8279b61a removed scep impl from virtual fire alarm 2017-01-07 14:54:46 +05:30
Hasunie
4121d5764d Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-06 22:41:52 +05:30
Rasika Perera
0790689635 Removing unused package import in virtual_firealarm 2017-01-06 21:43:26 +05:30
Rasika Perera
7d07585cf1 Merge pull request #509 from hasuniea/windows10
Windows10 Location support
2017-01-06 20:36:01 +05:30
Hasunie
1c840a091b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-06 19:58:27 +05:30
Hasunie
de533a0667 merging changes 2017-01-06 19:55:44 +05:30
Rasika Perera
82a1839fe9 Merge pull request #508 from dunithd/release-3.0.x
Adding Geo fencing link to Android device
2017-01-06 19:42:51 +05:30
Rasika Perera
3bb9a13b13 Merge pull request #507 from madhawap/release-3.0.x
Adding Swagger to Android sense end-points
2017-01-06 19:22:52 +05:30
madhawap
c98bb39fea resolving conflicts 2017-01-06 19:22:03 +05:30
Rasika Perera
55a7cee60e Removed unneccessary pom import 2017-01-06 19:04:52 +05:30
Rasika Perera
5f7bb6c48a Merge pull request #506 from milanperera/release-3.0.x
Improved scope-permission mapping
2017-01-06 19:04:13 +05:30
Hasunie
4c4d6b9d67 adding location operation to task 2017-01-06 18:53:48 +05:30
Hasunie
440473bc13 adding context path to web xml nonsecuredEndpoints 2017-01-06 18:49:52 +05:30
dunithd
8c36f31030 Adding Geo fencing link to Android device 2017-01-06 18:36:16 +05:30
Hasunie
e186ef6bb3 fixing jira issue IOTS-368 2017-01-06 18:29:32 +05:30
madhawap
9bb3839c87 Adding Swagger to Android sense end-points 2017-01-06 17:05:48 +05:30
Milan Perera
68e7a0bf26 Updated APIM version 2017-01-06 16:49:19 +05:30
Milan Perera
77d1e684f6 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-06 16:48:02 +05:30
Rasika Perera
530c112b8e Merge pull request #505 from rasika/release-3.0.x
Replaced [EMM] with [IoT Server]
2017-01-06 16:46:48 +05:30
sinthuja
8b7be8db38 Adding date picker for the full history view. 2017-01-06 16:33:54 +05:30
Rasika Perera
2c9c02dc00 Replaced [EMM] with [IoT Server] 2017-01-06 16:26:59 +05:30
Rasika Perera
0810928e0e Merge pull request #504 from dunithd/release-3.0.x
Fixing the geo dashboard link for Android sense, Raspberry and Arduin…
2017-01-06 15:54:54 +05:30
dunithd
41095da20c Fixing the geo dashboard link for Android sense, Raspberry and Arduino devices 2017-01-06 15:40:13 +05:30
Hasunie
8bd06c60f2 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-06 15:12:41 +05:30
Hasunie
32d603c8f6 updating API context and publish names 2017-01-06 14:56:57 +05:30
Hasunie
d7b94a7f07 adding location,reboot operation icons 2017-01-06 14:18:20 +05:30
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