Commit Graph

2480 Commits

Author SHA1 Message Date
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
Milan Perera
8a384a6664 Updated to APIM latest snapshot version 2017-01-05 11:21:51 +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
kamidu
332acab664 Fixing https://wso2.org/jira/browse/EMM-1858 2017-01-04 14:18:05 +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
Ruwan
ed24a2fff0 Merge pull request #496 from GPrathap/release-3.0.x
remove hardcoded oauth2 token
2017-01-03 08:28:57 +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
Rasika Perera
ff5659ec1a Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-25 02:16:11 +05:30
Rasika Perera
c7d9c167d1 Upgrading version of CDMF 2016-12-25 02:15:38 +05:30
Rasika Perera
ea61cb5799 Merge pull request #495 from wso2/release-3.0.4
Release 3.0.4
2016-12-24 23:09:35 +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
Rasika Perera
58bb6eb2bd Upgrading version of CDMF 2016-12-24 07:41:36 +05:30
Rasika Perera
c035568cb4 Upgrading cdmf version 2016-12-23 15:14:34 +05:30
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
Charitha Goonetilleke
f38d5f6d20 Merge pull request #494 from ruwany/release-3.0.x
Migrating appm/apim/identity/registry/governance to latest versions
2016-12-23 10:03:52 +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
Charitha Goonetilleke
a9a30b3e90 Merge pull request #492 from madhawap/release-3.0.x
Task operation config related changes
2016-12-22 18:29:13 +05:30
madhawap
4de0aab701 Merge branch 'release-3.0.x' of https://github.com/wso2/carbon-device-mgt-plugins into release-3.0.x 2016-12-22 17:55:06 +05:30
madhawap
77b5d2422c Task operation config related changes 2016-12-22 17:53:47 +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
sinthuja
2f5c68d29e Merge pull request #491 from menakaj/release-3.0.x
Multi line chats added.
2016-12-22 17:42:36 +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
Ruwan
87bf0293f2 Merge pull request #490 from rasika/release-3.0.x
IOTS-336: Fixing android and windows mobile agents title
2016-12-22 09:40:39 +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
Rasika Perera
da3f350b01 Merge pull request #489 from menakaj/release-3.0.x
Adding new streams and gadgets for android sense.
2016-12-20 13:05:05 +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
Rasika Perera
d7b427527a Merge pull request #487 from charithag/release-3.0.x-qrupdate
Update device type detail pages and moved QR modal to device mgt core
2016-12-19 15:32: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
Ace
488c2abafa removing slf4j from packing in the android devicemgt jaxrs 2016-12-19 15:24:02 +05:30