Commit Graph

871 Commits

Author SHA1 Message Date
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
2c9c02dc00 Replaced [EMM] with [IoT Server] 2017-01-06 16:26:59 +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
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
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
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
ayyoob
f603f58fd1 moved compliance payload generation code to api impl 2017-01-05 22:06:37 +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
Rasika Perera
4fa044357b Replaced [Enterprise Mobility Manager] with [WSO2 IoT Server] 2017-01-05 17:16:31 +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
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
45162ac155 Fixed conflicts and merged 2017-01-03 10:43:55 +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
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
Rasika Perera
5465cea76d Fixing QR modal unit not found issue 2016-12-22 14:03:49 +05:30
Ace
34c4d00d4f Bumping identity dependencies 2016-12-22 12:34:28 +05:30
Ace
8ac0971a24 Updating identity dependencies to latest 2016-12-22 11:01:56 +05:30
Geeth
b8472666ad Merge pull request #488 from Supun94/release-3.0.x
Support for Device Management Policy Merging
2016-12-22 10:37:59 +05:30
Rasika Perera
27e066e92a IOTS-336: Fixing android and windows mobile agents title 2016-12-22 09:37:37 +05:30
charitha
0c2465d03e Add enrollment invitations API EP for android 2016-12-20 23:48:21 +05:30
charitha
2211ad2a59 Update device type detail pages and moved QR modal to device mgt core 2016-12-19 15:26:29 +05:30
Ace
488c2abafa removing slf4j from packing in the android devicemgt jaxrs 2016-12-19 15:24:02 +05:30
Charitha Goonetilleke
38903585ba Merge pull request #486 from DimalChandrasiri/release-3.0.x
Adding email sender changes
2016-12-19 13:46:37 +05:30
Charitha Goonetilleke
8b258ce24f Merge pull request #485 from hasuniea/windows10
adding Windows10 operation and policy support
2016-12-19 13:45:55 +05:30
Ace
6697dbcc59 upgrading to latest version of identity 2016-12-19 11:38:12 +05:30
Imesh Chandrasiri
48461af2c3 Adding email sender changes 2016-12-19 11:27:43 +05:30
Imesh Chandrasiri
6464fcb615 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-19 11:12:49 +05:30
Hasunie
2b2c38aa46 fixing formatting issues 2016-12-19 08:53:39 +05:30
Hasunie
1d0752f09c fixing device name issue in windows8.1 enrollment 2016-12-19 08:33:32 +05:30
Hasunie
0ffb142023 fixing windows10 enrollment endpoiny issues 2016-12-19 08:32:47 +05:30
Hasunie
965f396757 adding Device Details to Device-view UI 2016-12-19 08:21:58 +05:30
Hasunie
fcb5a354a2 fixing enrollment service issues 2016-12-19 08:11:46 +05:30
Hasunie
67e75ee38a adding DeviceInfo operation handler 2016-12-19 08:06:36 +05:30
Supun94
57f0ea7ce4 Changing policy compliance view 2016-12-19 04:57:17 +05:30
Imesh Chandrasiri
da4eb14144 Device view changes for email invite and agent download 2016-12-16 14:56:15 +05:30
Rasika Perera
a08e58a574 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-16 12:43:55 +05:30
Hasunie
d82670fa94 fixing windows annotation issues 2016-12-15 18:38:13 +05:30
Hasunie
c03a2fabc7 adding DeviceInfo properties 2016-12-15 16:46:26 +05:30
Hasunie
b3ffc7fdd7 adding win10 alert constants 2016-12-15 16:45:44 +05:30
Hasunie
1eb8c8e9db adding win10 operation trigger alert 2016-12-15 16:44:49 +05:30
Hasunie
6857ba1b74 adding Device Info to win10 2016-12-15 16:43:14 +05:30
Hasunie
69ebf70484 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2016-12-15 14:53:33 +05:30
Hasunie
db03b6fc19 refactoring windows UI 2016-12-15 14:51:09 +05:30
Hasunie
19f289c8fa adding windows operation properties 2016-12-15 14:46:21 +05:30
Hasunie
158e5fca2a removing services path 2016-12-15 14:38:20 +05:30
Hasunie
90ad21e960 adding bean refference for win10 2016-12-15 14:35:24 +05:30
Hasunie
fc7d86801f fixing windows8.1 Device name issue 2016-12-15 14:34:15 +05:30
Hasunie
9571d782c8 configure to enroll win10 on csr sigining step 2016-12-15 14:27:36 +05:30
Hasunie
b9b5edc342 adding new devicemanegement endpoint to getpending operations 2016-12-15 14:26:07 +05:30
Hasunie
c52c292d15 adding Device-Info operation 2016-12-15 14:25:01 +05:30
Hasunie
84a6522cb8 removing unwanted values from notification 2016-12-15 14:18:15 +05:30
Hasunie
120283adf4 adding windows10 csp 2016-12-15 14:09:54 +05:30
Hasunie
89a4482124 adding windows 10 plugin constants 2016-12-15 14:02:07 +05:30
Hasunie
471c8c628b deleting unused hbs file 2016-12-15 13:59:39 +05:30
Imesh Chandrasiri
fe195ca8f7 UI Fixes 2016-12-14 14:03:41 +05:30
Megala
0b1acaa990 Updating the agent apk file 2016-12-14 10:56:03 +05:30
Milan Perera
72a33b7930 Fixed conflicts and merged 2016-12-14 09:20:42 +05:30
Megala
ec5936d013 Updating the apk file to switch between event enabling and disabling 2016-12-13 19:37:42 +05:30
Hasunie
316362e974 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2016-12-12 00:52:27 +05:30
Hasunie
d3bf748233 implementing windows10 devicemgt session 2016-12-12 00:34:23 +05:30
Hasunie
b57573ecae Merging relese-3.0.x 2016-12-12 00:27:16 +05:30
Rasika Perera
b5e220799a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-09 18:39:59 +05:30
WSO2 Builder
a398686ec7 [maven-release-plugin] prepare for next development iteration 2016-12-09 05:46:04 +00:00
WSO2 Builder
3bafccc303 [maven-release-plugin] prepare release v3.0.3 2016-12-09 05:43:17 +00:00
Hasunie
359bd948d2 Fixing bst issue 2016-12-09 10:53:07 +05:30
Hasunie
222ef41a3f Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-09 10:43:50 +05:30
Chatura Dilan
49d81766f6 fixed conflicts 2016-12-09 10:35:36 +05:30
Chatura Dilan
e22d4d3530 Fixed UI issues in the policy screen 2016-12-09 10:29:53 +05:30
Hasunie
0e680ab26b fixing json provider issue in windows cxf 2016-12-09 09:36:27 +05:30
Milan Perera
6ad6bbbdc0 Commiting permission-scope mapping improvements 2016-12-08 20:41:44 +05:30
Charitha Goonetilleke
6cea2f19fc Merge pull request #470 from hasuniea/release-3.0.x
fixing message issue in configurationmgtservice
2016-12-08 20:08:24 +05:30
charitha
a49a5650c6 Fix issues 2016-12-08 20:07:16 +05:30
Hasunie
34153371d3 fixing message issue in configurationmgtservice 2016-12-08 19:15:34 +05:30
charitha
5d7fd0d66d Merge branch 'harshanL-master' of https://github.com/harshanL/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 19:00:22 +05:30
Harshan Liyanage
ce5d907801 Added operation bar.json 2016-12-08 18:55:50 +05:30
Ruwan
82c0af1053 Merge pull request #467 from madhawap/release-3.0.x
Adding separate tasks to carry out device monitoring for each device type
2016-12-08 18:12:59 +05:30
Harshan Liyanage
26bbb55af5 Resolved conflicts with release-3.0.x 2016-12-08 18:07:14 +05:30
madhawap
6618b919d1 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:40:43 +05:30
Hasunie
68cabad5b8 deleting unused components 2016-12-08 16:43:05 +05:30
Harshan Liyanage
559fa3fe38 Resolved conflicts 2016-12-08 16:40:18 +05:30
Hasunie
d2d39a241e adding error handler 2016-12-08 16:18:01 +05:30
Hasunie
b3eacb99cd Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 16:06:17 +05:30
Hasunie
36cbc96713 adding swagger annotations 2016-12-08 16:04:46 +05:30
Madawa Soysa
548213d601 Fixing issue with COSU policy configuration 2016-12-08 14:22:23 +05:30
Madawa Soysa
22dccce027 IOTS-296: Moving windows operation-mod to android plugin
This commit moves the operation-mod functions to windows plugin and refactor policy CRUD code to use plugin specific operation mod functions.
2016-12-08 12:26:36 +05:30