Commit Graph

821 Commits

Author SHA1 Message Date
hasuniea
349c3bdb63 fixing App Version not updating in portal after being initially set 2016-08-11 15:56:03 +05:30
harshanl
8fa311e119 Removed unnecessary properties from EnrollmentInfo object 2016-08-10 18:25:35 +05:30
prabathabey
fc5021a0d5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-10 14:24:33 +05:30
prabathabey
c7730adbcb Improving the retrieval of activities 2016-08-10 14:24:21 +05:30
harshanl
eb801696bf Fixed EMM-1492 2016-08-10 12:55:58 +05:30
harshanl
f82ce82648 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-10 11:14:53 +05:30
harshanl
08ff70bb3c Refactored CertMgt component 2016-08-10 11:14:46 +05:30
mharindu
5bdb4630af Fixed conflicts and merged 2016-08-08 19:38:49 +05:30
mharindu
734aaa8c9e Fixed null pointer exception 2016-08-08 19:24:57 +05:30
mharindu
886e2e08f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-08-08 18:49:40 +05:30
hasuniea
1b07b18678 adding security fixes 2016-08-08 18:05:12 +05:30
mharindu
acf6d7ecd7 Fixed conflicts and merged 2016-08-08 10:42:30 +05:30
harshanl
f1c1c67656 Removed unused policy.mgt module from device core bundle 2016-08-05 11:34:11 +05:30
harshanl
657e4864fb Added MSSQL, PostgreSQL and Oracle db support for Notification feature. 2016-08-04 20:40:40 +05:30
harshanl
35ea88b9de Fixed EMM-1476. 2016-08-04 20:39:31 +05:30
Prabath Abeysekara
cc90bef42b Merge pull request #318 from Securepoint/master
Minor bug fixies and code improvements
2016-08-03 14:12:24 +05:30
mharindu
eb5216091e Fixed conflicts and merged 2016-08-03 12:36:56 +05:30
madhawap
5bd879545b fix for the iOS device operations blocker 2016-08-02 19:45:39 +05:30
madhawap
2e71c21378 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-08-02 19:04:54 +05:30
madhawap
d315e739e4 fix for the iOS device operations blocker 2016-08-02 19:04:28 +05:30
inoshperera
2e8df6a16a Merge pull request #322 from charithag/master
Fix issues in sql statements
2016-08-02 14:33:30 +05:30
charitha
efcd5272d2 Fix issues in sql statements 2016-08-02 14:31:12 +05:30
harshanl
6cc1bb088c Fixed EMM-1447, EMM-1424 2016-08-01 20:29:21 +05:30
mharindu
84090fb16c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-29 12:39:05 +05:30
Milan Perera
c49dc435e1 Merge pull request #319 from ayyoob/transport
Updated grant type implementation
2016-07-28 14:14:03 +05:30
prabathabey
5ed3174a28 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-07-26 23:37:48 +05:30
prabathabey
5adfab9f8a Improving connection handling in cert management related functionalities, adding UNIQUE key constraints to DM_DEVICE and DM_ENROLMENT tables, improving response handling of certificate management admin API 2016-07-26 23:37:42 +05:30
Ace
07b12fe4ea Bug fixes 2016-07-26 22:03:14 +05:30
prabathabey
c63818b78f Avoiding multiple device data getting retrieved upon the same id 2016-07-26 19:31:44 +05:30
prabathabey
e27905792f Code cleanup 2016-07-26 19:14:43 +05:30
prabathabey
5bc7cf7c30 Simplifying operation management related implementations 2016-07-26 18:32:00 +05:30
mharindu
564c2b280e Fixed conflicts and merged 2016-07-26 16:38:51 +05:30
Chatura Dilan
046cd6586c Merge branch 'master' of github.com:wso2/carbon-device-mgt 2016-07-26 12:00:17 +05:30
Chatura Dilan
7af8ecc686 Added userstore for role listing 2016-07-26 11:59:10 +05:30
prabathabey
bd1322e801 Improving transaction handling in certificate management component and cleaning up the OperationManagerImpl 2016-07-26 11:28:31 +05:30
mharindu
827567733c Fixed scope update issue in API update 2016-07-22 16:41:40 +05:30
ayyoob
250ce1f77c added device mgt grant types 2016-07-21 20:14:43 +05:30
mharindu
b3d309583d Fixed issues in scope service 2016-07-21 20:13:38 +05:30
mharindu
7f1e2fdf0b Implemented scope management service 2016-07-21 12:43:21 +05:30
mharindu
bdec8880bb Fixed conflicts and merged 2016-07-18 20:22:27 +05:30
mharindu
186432e1df Fixed webapp name resolving issue 2016-07-18 20:08:51 +05:30
Dulitha Wijewantha
03f323d6e2 Fixed a bug where getBoolean wasn't used 2016-07-18 12:29:58 +05:30
Timo Briddigkeit
ed07774552 Fixed literal string comparison.
This line is in the form of
String str = ...
str.equals("someOtherString");
//or
str.compareTo("someOtherString");

A NullPointerException may occur if the String variable str is null. If instead the code was restructured to
String str = ...
"someOtherString".equals(str);
//or
"someOtherString".compareTo(str);
that is, call equals() or compareTo() on the string literal, passing the variable as an argument, this exception could never happen as both equals() and compareTo() check for null.
2016-07-15 16:25:31 +02:00
mharindu
80f737822e Fixed enrollment device mapping issue 2016-07-15 19:45:04 +05:30
Prabath Abeysekara
fbb09a7f58 Merge pull request #316 from xenobyte/master
Fixed predictable pseudorandom number generator
2016-07-15 13:17:23 +05:30
prabathabey
40b43a8b97 DAO exceptions thrown while retrieving advance details of devices appears to have been swallowen at the REST API implementation that exposes the aforementioned functionality. This particular fix resolves it 2016-07-14 01:24:00 +05:30
Timo Briddigkeit
b674304087 Made constants real constant using final 2016-07-13 15:57:12 +02:00
Timo Briddigkeit
ee5b077e6a Fixed various XML External Entity (XXE) attack vulnerabilities 2016-07-13 15:02:11 +02:00
mharindu
0f904e21d8 Fixed conflicts and merged 2016-07-11 22:12:15 +05:30
Chatura Dilan
4ec11e8c08 [maven-release-plugin] prepare for next development iteration 2016-07-08 19:11:40 +05:30