Commit Graph

349 Commits

Author SHA1 Message Date
Hasunie
10cab941ee Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-19 22:35:30 +05:30
Hasunie
86d91c3bdf fixing Windows synapse config issues 2017-01-19 22:33:58 +05:30
Rasika Perera
3b5159bed5 Merge pull request #542 from hasuniea/windows10
Fixing Windows10 passcode policy issue
2017-01-19 19:33:15 +05:30
Rasika Perera
737d1da07b Changed webapps title [EMM] into [IoT Server] 2017-01-19 17:04:01 +05:30
Hasunie
399496ce82 fixing windows10 policy issue 2017-01-19 15:57:19 +05:30
Rasika Perera
3b7257c93f Fixing "process" not found issues 2017-01-19 07:41:13 +05:30
Rasika Perera
9a3fc7e446 Cleaned windows-web-agent config.json 2017-01-19 01:34:48 +05:30
Rasika Perera
c04851d448 Removed iOS stuff from windows-web-agent 2017-01-19 01:34:48 +05:30
Rasika Perera
8b1a27a181 Merge pull request #536 from hasuniea/windows10
Fixing Windows plugin issues
2017-01-19 01:26:08 +05:30
Rasika Perera
1d10dbee88 Now UI configs supports system parameters with eg. %iot.core.host% 2017-01-19 00:58:13 +05:30
Hasunie
736b09de31 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-18 19:14:02 +05:30
Hasunie
164ae997b1 fixing synapse config issues 2017-01-18 19:09:46 +05:30
Hasunie
1362e2d7fe Fixing windows policy issues 2017-01-18 18:03:28 +05:30
Rasika Perera
bf9d93476c Updated title [EMM] into [IoT Server] 2017-01-18 09:02:29 +05:30
Rasika Perera
1d0753ab8d Merge pull request #529 from DimalChandrasiri/release-3.0.x
Fixed android type view notification pane message inconsistancy issue
2017-01-17 19:41:19 +05:30
Imesh Chandrasiri
dc840c389a Fix for inconsistant notification message 2017-01-17 17:48:12 +05:30
Hasunie
95a7ff6aaf fixing windows app-conf issue 2017-01-17 16:48:10 +05:30
Hasunie
e030be3d24 fixed code conflicts 2017-01-17 16:40:06 +05:30
Hasunie
38216c4b9d fixing win10,8.1 conflicting issues 2017-01-17 16:04:48 +05:30
Rasika Perera
05e2cb7bb8 Changed [EMM] title into [IoT Server] 2017-01-17 15:34:08 +05:30
Rasika Perera
0b983855cf Merge pull request #522 from DimalChandrasiri/release-3.0.x
Fix for multiple popup issue
2017-01-17 11:49:59 +05:30
ayyoob
9d64fd0d4b fixed multi tenant login issue 2017-01-16 16:08:07 +05:30
Imesh Chandrasiri
d918e32d59 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-14 23:51:43 +05:30
Imesh Chandrasiri
e112371d8e Fix for multiple popup issue 2017-01-14 23:51:07 +05:30
WSO2 Builder
3f1b7a6005 [maven-release-plugin] prepare for next development iteration 2017-01-14 12:22:40 +00:00
WSO2 Builder
91a0edb0a0 [maven-release-plugin] prepare release v3.0.6 2017-01-14 12:17:46 +00:00
Hasunie
bd0f1f1900 fixing windows requestToken issue 2017-01-13 19:31:35 +05:30
Hasunie
810bbafea3 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-13 18:43:48 +05:30
Hasunie
ed0b40215a fixing synapse config issues 2017-01-13 18:43:03 +05:30
Hasunie
c162f379b4 adding windows operation scope 2017-01-13 18:19:40 +05:30
Rasika Perera
f84e3526f5 changed [fw-ok] with [fw-success] 2017-01-13 17:50:19 +05:30
Hasunie
97705311b9 removing install app tab from the device view 2017-01-13 16:09:45 +05:30
Hasunie
a2ae12f9d1 adding windows 10 updates 1607/1511 changes 2017-01-13 16:08:58 +05:30
Hasunie
4c4fd00593 fixing issue in different type of windows device payloads 2017-01-13 16:06:31 +05:30
Hasunie
8655da595e removing swagger definition from the soap endpoints 2017-01-13 16:05:10 +05:30
Rasika Perera
72d9e2d0d3 Merge pull request #515 from hasuniea/windows10
Fixing gateway issues in windows
2017-01-13 13:01:40 +05:30
Hasunie
e81d2b1c20 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-13 09:08:04 +05:30
Hasunie
429266d9d2 adding windows synaps configs 2017-01-13 09:07:33 +05:30
ayyoob
09f7fb3a5f moved the traffic through the gateway 2017-01-13 04:49:35 +05:30
ayyoob
466c2b1151 moved to gateway mode 2017-01-12 19:29:59 +05:30
Hasunie
32d99bcab6 fixing jira IOTS-378 2017-01-11 14:13:08 +05:30
Imesh Chandrasiri
fc3d15887e Updating font wso2 to version 1.2.1 2017-01-11 11:20:21 +05:30
Hasunie
a905f22651 fixing Windows gatway issues 2017-01-11 09:03:03 +05:30
Hasunie
9e59993900 fixing issue in admin service tag 2017-01-09 08:25:54 +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
Hasunie
de533a0667 merging changes 2017-01-06 19:55:44 +05:30
Rasika Perera
55a7cee60e Removed unneccessary pom import 2017-01-06 19:04:52 +05:30
Hasunie
440473bc13 adding context path to web xml nonsecuredEndpoints 2017-01-06 18:49:52 +05:30
Hasunie
e186ef6bb3 fixing jira issue IOTS-368 2017-01-06 18:29:32 +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
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
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
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
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
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
2211ad2a59 Update device type detail pages and moved QR modal to device mgt core 2016-12-19 15:26:29 +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
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
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
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
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
Milan Perera
72a33b7930 Fixed conflicts and merged 2016-12-14 09:20: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
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
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
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
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
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
Hasunie
0456502bbe implementing windows 10 enrollment 2016-12-07 09:18:43 +05:30
Madawa Soysa
cb44d9a824 IOTS-296: Genaralizing policy view UI for windows and android
Moving device type specific UI components related to policy view. This commit includes modifications for both android and windows plugins.
2016-12-06 12:22:25 +05:30
Madawa Soysa
3ed9b530f5 IOTS-296: Generalizing policy UI for windows device type
This commit includes moving policy flow device type specific client side logic and UI components to the windows plugin.
2016-12-02 17:06:02 +05:30
WSO2 Builder
619dab548e [maven-release-plugin] prepare for next development iteration 2016-12-01 13:52:49 +00:00
WSO2 Builder
4a0aa3be8e [maven-release-plugin] prepare release v3.0.2 2016-12-01 13:50:48 +00:00
charitha
e6eb6bb2d2 Merge branch 'release-3.0.x' of https://github.com/hasuniea/carbon-device-mgt-plugins into release-3.0.x 2016-12-01 17:08:57 +05:30
Hasunie
8ff55aada8 changing add enromment 2016-12-01 16:21:57 +05:30
Hasunie
b19629ab23 adding windows enrollment image 2016-12-01 16:20:05 +05:30
madhawap
429b52f037 resolve conflicts 2016-12-01 16:04:43 +05:30
madhawap
3249079965 Seperate out task operations 2016-12-01 15:41:07 +05:30
Hasunie
35ba0b2a9b fixing windows enrollment flow 2016-12-01 09:40:29 +05:30
Hasunie
0fd317d027 adding windows operation bar 2016-12-01 09:35:01 +05:30
Hasunie
fa6ef30d17 fixing windows device view issues 2016-12-01 09:26:14 +05:30
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
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
Hasunie
1038c23c98 adding windows qr-code scanner 2016-11-29 11:24:22 +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
Ace
f3de1cf85e Adding windows-web-agent 2016-11-21 11:15:30 +05:30
GPrathap
3d971d2bb7 removed @API and @Permission annotations and added @SwaggerDefinition and @Authorization annotations 2016-11-20 19:04:11 +05:30
WSO2 Builder
61ca4c4900 [maven-release-plugin] prepare for next development iteration 2016-11-16 13:57:06 +00:00