Commit Graph

336 Commits

Author SHA1 Message Date
charitha
b812b6af2e Fixed issue in showing android device location map 2017-01-09 12:36:06 +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
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
dunithd
8c36f31030 Adding Geo fencing link to Android device 2017-01-06 18:36:16 +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
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
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
ayyoob
3fa679a3e9 made policy manager to be part of device type mgt service 2017-01-05 14:37:27 +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
838223c67a Removed unneccesary configs 2017-01-04 00:18:28 +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
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
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
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
Megala
ec5936d013 Updating the apk file to switch between event enabling and disabling 2016-12-13 19:37:42 +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
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
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
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