Commit Graph

1934 Commits

Author SHA1 Message Date
kamidu
86a3b18464 adding location history to map view 2017-01-19 17:41:08 +05:30
Rasika Perera
737d1da07b Changed webapps title [EMM] into [IoT Server] 2017-01-19 17:04:01 +05:30
Hasunie
857e971fa6 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-19 15:58:01 +05:30
Hasunie
399496ce82 fixing windows10 policy issue 2017-01-19 15:57:19 +05:30
Menaka Jayawardena
872baf637f Replacing android sense agent apk. 2017-01-19 13:00:35 +05:30
Menaka Jayawardena
ed28fb6adb Adding permission updater for other device types. 2017-01-19 13:00:35 +05:30
Menaka Jayawardena
a7692b66d4 Removing commented code and refactoring. 2017-01-19 13:00:35 +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
fe6c35ebca Cleaned android-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
a521b41352 Merge pull request #539 from menakaj/release-3.0.x
Permissions added for android sense
2017-01-19 01:24:07 +05:30
Rasika Perera
0bc380c7d0 Merge pull request #538 from Kamidu/release-3.0.x
Enable location history
2017-01-19 01:23:55 +05:30
Rasika Perera
1d10dbee88 Now UI configs supports system parameters with eg. %iot.core.host% 2017-01-19 00:58:13 +05:30
Menaka Jayawardena
6df9479fea device-mgt user permissions added for android sense. 2017-01-18 22:51:31 +05:30
Menaka Jayawardena
e19802312e Operation bar removed from android-sense device. 2017-01-18 22:51:31 +05:30
kamidu
c522809bd5 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-18 22:41:48 +05:30
kamidu
234157b6f5 adding location history to map view 2017-01-18 22:41:11 +05:30
Megala
574a106977 Adding fixes to path 2017-01-18 21:46:37 +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
357010120a Merge pull request #535 from Jasintha/release-3.0.x
receiving message format has been changed ,so updated the client according to …
2017-01-18 17:27:43 +05:30
Jasintha
55e0cec875 receving message has been chaged ,so updated the client according to that 2017-01-18 16:20:46 +05:30
Chatura Dilan
7e58c17b1e Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-18 15:20:25 +05:30
Chatura Dilan
6db0885eb9 remove cosu whitelisting apps 2017-01-18 15:19:05 +05:30
Menaka Jayawardena
8e33e31704 Giving high priority for call and sms receivers and replacing android sense agent. 2017-01-18 11:59:14 +05:30
Megala
c35727ae0b resolving conflicts 2017-01-18 09:47:00 +05:30
Megala
444119790c Fixing geo dashboard issues 2017-01-18 02:33:04 +05:30
ayyoob
f1e75d9375 apim seperation 2017-01-18 01:48:43 +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
Rasika Perera
c74e9de2f5 Merge pull request #527 from dunithd/release-3.0.x
Formatting the anchor text after fixing 500 error
2017-01-17 19:40:38 +05:30
Rasika Perera
00ff43bfb4 Merge pull request #530 from hasuniea/windows10
fixing win10, 8.1 conflicting issues
2017-01-17 19:40:22 +05:30
Imesh Chandrasiri
dc840c389a Fix for inconsistant notification message 2017-01-17 17:48:12 +05:30
Imesh Chandrasiri
62ba568e05 Fixed android type view notification pane message inconsistancy issue 2017-01-17 17:34:51 +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
Menaka Jayawardena
88b8901f75 Removed unused Test page from portal dashboard. 2017-01-17 16:15:23 +05:30
Menaka Jayawardena
f699ba54b3 Added Api annotation to AndroidSenseService 2017-01-17 16:14:49 +05:30
Hasunie
38216c4b9d fixing win10,8.1 conflicting issues 2017-01-17 16:04:48 +05:30
Dunith Dhanushka
bbbfff28d9 UI Improvements for Geo Fencing 2017-01-17 15:40:27 +05:30
Dunith Dhanushka
d4107747ab Update device-view.js 2017-01-17 15:35:59 +05:30
Rasika Perera
05e2cb7bb8 Changed [EMM] title into [IoT Server] 2017-01-17 15:34:08 +05:30
Dunith Dhanushka
54b08f9b7a Adding the JSON formatted anchor text 2017-01-17 15:10:46 +05:30
Dunith Dhanushka
6634dded55 Building the anchor text 2017-01-17 15:09:05 +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
Dunith Dhanushka
c6437c3065 Formatting the title 2017-01-17 11:14:58 +05:30
Dunith Dhanushka
c1de144bcf Setting device id and type to page title 2017-01-17 11:04:19 +05:30
ayyoob
dad3a34a27 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 22:40:03 +05:30
Dunith Dhanushka
b4f876d961 Updating the label text for Geo fencing link 2017-01-16 18:57:45 +05:30
Dunith Dhanushka
97d4fb1ef9 Removing advanced Geo fencing controls 2017-01-16 18:54:42 +05:30
Dunith Dhanushka
2c696b7222 Displaying the sidebar while page loads 2017-01-16 18:41:10 +05:30
ayyoob
76326b936c Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 18:30:01 +05:30
ayyoob
9d64fd0d4b fixed multi tenant login issue 2017-01-16 16:08:07 +05:30
Menaka Jayawardena
ed85f78311 Replacing android-sense agent 2017-01-16 14:14:18 +05:30
Menaka Jayawardena
d8c2d65f05 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-16 00:13:35 +05:30
Imesh Chandrasiri
8eb95c3695 Fix for multiple popup issue 2017-01-14 23:56:51 +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
Menaka Jayawardena
4eb186140a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-14 16:37:52 +05:30
Rasika Perera
3ae9fba143 Updating IoTS doc links 2017-01-13 23:14:26 +05:30
Rasika Perera
a3e97b4356 Merge pull request #521 from dunithd/release-3.0.x
Replacing the value of GLOBAL-STATE param with comma separated deviceId,deviceType
2017-01-13 22:42:53 +05:30
Dunith Dhanushka
a097482b91 Passing deviceId and deviceType into view 2017-01-13 20:26:13 +05:30
Dunith Dhanushka
33e57efc3d Replacing JSON object with comma separated values 2017-01-13 20:25:03 +05:30
Chatura Dilan
d55e0f21b7 Merge branch 'release-3.0.x' of github.com:wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-13 20:21:33 +05:30
Chatura Dilan
809d292c95 Added Android scopes 2017-01-13 20:21:14 +05:30
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
Rasika Perera
ebe47ef972 Merge pull request #516 from DimalChandrasiri/release-3.0.x
Updating font wso2 to version 1.2.1
2017-01-11 22:41:29 +05:30
Milan Perera
76f52af4a5 Refactored android sense agent 2017-01-11 15:44:50 +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
43a61d046b Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2017-01-11 09:03:35 +05:30
Hasunie
a905f22651 fixing Windows gatway issues 2017-01-11 09:03:03 +05:30
Menaka Jayawardena
672f153551 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2017-01-10 14:34:33 +05:30
Milan Perera
2eb18e304a Change scope of android configuration 2017-01-10 11:39:09 +05:30
charitha
b812b6af2e Fixed issue in showing android device location map 2017-01-09 12:36:06 +05:30
Hasunie
9e59993900 fixing issue in admin service tag 2017-01-09 08:25:54 +05:30
ayyoob
1df7d20a81 moved common configuration to global properties for input and output adapters 2017-01-08 21:26:14 +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
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
ayyoob
2e8279b61a removed scep impl from virtual fire alarm 2017-01-07 14:54:46 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Menaka Jayawardena
bdb4421a8e Changed the url to point to the portal home page. (Sensors view) 2016-12-22 17:52:24 +05:30
Menaka Jayawardena
2fcaf12373 Code reformatting. 2016-12-22 16:42:48 +05:30
Menaka Jayawardena
81b5b1a907 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-22 16:36:14 +05:30
Menaka Jayawardena
c45a06b95a New gadgets were added for Accelerometer, Gyroscope, Rotation and Magnetic field. 2016-12-22 16:34:45 +05:30
Menaka Jayawardena
f0d7e4648a Android sense execution plans changed to be used with multiline charts. 2016-12-22 16:33:27 +05:30
Menaka Jayawardena
4add08545a Removed previously created accelerometer gadgets. 2016-12-22 16:32:06 +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
Menaka Jayawardena
8de3587717 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-20 12:34:10 +05:30
Menaka Jayawardena
f6927be10a Created gadgets and streams for sensor data. 2016-12-20 12:31:49 +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
45fdd2a7e0 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into windows10 2016-12-19 08:54:25 +05:30
Hasunie
2b2c38aa46 fixing formatting issues 2016-12-19 08:53:39 +05:30
Rasika Perera
d1842ca64c Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-19 08:41:18 +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
Megala
600e2529bd Fixing race conditions in refresh token generation 2016-12-16 14:10:38 +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
Ruwan
bb1435e273 Merge pull request #482 from menakaj/release-3.0.x
Android Sense Analytics script modifications.
2016-12-16 10:46:39 +05:30
Menaka Jayawardena
9f4f70af61 Disabled unused battery script deployment. 2016-12-16 10:39:34 +05:30
Menaka Jayawardena
d4851c9815 Corrected android headset script name. 2016-12-16 10:38:11 +05:30
Menaka Jayawardena
08a0a290c2 Fixed : SMS Script not executing automatically. 2016-12-16 10:36:47 +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
sinthuja
3d504afa35 Fixing issues in the full history view in geo fence. 2016-12-15 16:12:02 +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
Megala
39bb1f92ba Removing hard coded values and adding missing file 2016-12-15 14:05:16 +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
Menaka Jayawardena
ba5486c05c Typo fixed in analytics scripts. 2016-12-14 18:08:57 +05:30
sinthuja
b223f7374e Committing the changes for the android persisted goe alert. 2016-12-14 17:13:43 +05:30
sinthuja
550322fc0f Merge pull request #479 from menakaj/release-3.0.x
Removed unwanted artifact dependency.
2016-12-14 16:57:47 +05:30
Menaka Jayawardena
e47ae4cad2 Removed unwanted artifact dependancy. 2016-12-14 15:08:37 +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
Megala
5eefdfc2c0 Merge remote-tracking branch 'upstream/release-3.0.x' into embed 2016-12-12 17:56:39 +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
Megala
5b7b4124b0 Adding minor UI fixes 2016-12-09 10:10:47 +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
1598748a5b Merge branch 'release-3.0.x' of https://github.com/menakaj/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 19:13:31 +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
Harshan Liyanage
2f7214cd5b Resolved conflicts in device type-vies files. 2016-12-08 18:31:53 +05:30
Harshan Liyanage
f55cd20a73 Resolved conflicts in device type-vies files. 2016-12-08 18:27:56 +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
Menaka Jayawardena
bad0331dc7 Added new Android Sense Agent 2016-12-08 17:56:29 +05:30
madhawap
6618b919d1 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:40:43 +05:30
Charitha Goonetilleke
34fb3cad0b Merge pull request #459 from menakaj/release-3.0.x
Android Sense stabilization
2016-12-08 17:23:57 +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
Menaka Jayawardena
862a14c2b5 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-08 16:37:52 +05:30
Menaka Jayawardena
e0afb8d205 Refactoring Android Sense agent.
Increased the battery data retrieving sequence.
Completed network data reading implementation.
The data publishing interval is changed to 1000ms.
2016-12-08 16:36:29 +05:30
Hasunie
d2d39a241e adding error handler 2016-12-08 16:18:01 +05:30