Commit Graph

1700 Commits

Author SHA1 Message Date
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