charitha
0fe827ca9f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-25 13:10:48 +05:30
charitha
9246cdcf30
Return empty array when results not found with since parameter
2016-08-25 12:28:55 +05:30
Saad Sahibjan
a72b47f6f7
Fixing incorrect response for remove policy
2016-08-24 19:18:35 +05:30
harshanl
f3aefcca77
Fixed EMM-1450
2016-08-23 17:57:08 +05:30
Chatura Dilan Perera
8b17cbb339
Fix conflicts
2016-08-19 15:00:57 +05:30
Chatura Dilan Perera
654e1d9938
[maven-release-plugin] prepare for next development iteration
2016-08-18 22:09:42 +05:30
Chatura Dilan Perera
aa24821667
[maven-release-plugin] prepare release v1.1.2
2016-08-18 22:09:33 +05:30
harshanl
67942d5c1d
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-18 19:45:47 +05:30
dilanua
6b4ab635af
Fixing jiras: EMM-1472, EMM-1505
2016-08-18 14:30:53 +05:30
harshanl
2cb8f0b313
Fixed EMM-1392
2016-08-16 18:02:30 +05:30
Ruwan
6134f94e3c
Merge pull request #332 from ayyoob/com
...
fixing commit issues
2016-08-16 08:27:17 +05:30
hasuniea
282f53bf09
Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3
2016-08-15 21:00:23 +05:30
hasuniea
c269f35ef2
fixing getAllActivity H2 issue
2016-08-15 21:00:15 +05:30
mharindu
7346313d27
Modified scope management service
2016-08-15 20:30:45 +05:30
ayyoob
442c2b86da
fixed formatting issues
2016-08-15 15:19:18 +05:30
harshanl
a7d7c689e8
Removed unsupported roleName parameter from device API
2016-08-15 13:59:30 +05:30
ayyoob
3b56668af0
merged with upstream
2016-08-13 10:47:18 +05:30
madhawap
ecfe94235f
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-12 12:46:27 +05:30
madhawap
c6cc5e8df3
fixes to role updating endpoint
2016-08-12 12:45:58 +05:30
ayyoob
3edc68d204
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into com
2016-08-12 12:27:35 +05:30
ayyoob
058f9e4cfa
merged with origin
2016-08-12 10:52:56 +05:30
harshanl
e80c2f4050
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
2016-08-11 17:27:10 +05:30
dilanua
352643a421
Changing deactivate-policy api method to PUT
2016-08-11 15:31:28 +05:30
harshanl
34e97aeeae
Removed device search using roleName parameter.
2016-08-11 14:03:09 +05:30
mharindu
5bdb4630af
Fixed conflicts and merged
2016-08-08 19:38:49 +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
mharindu
2e79dd290e
Modified scopes
2016-08-08 18:24:44 +05:30
hasuniea
1b07b18678
adding security fixes
2016-08-08 18:05:12 +05:30
harshanl
657e4864fb
Added MSSQL, PostgreSQL and Oracle db support for Notification feature.
2016-08-04 20:40:40 +05:30
mharindu
ed4c762bfd
Refactored scopes
2016-08-04 17:46:46 +05:30
ayyoob
a7074e2e4e
refactored general configuration
2016-08-03 17:23:16 +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
harshanl
6cc1bb088c
Fixed EMM-1447, EMM-1424
2016-08-01 20:29:21 +05:30
mharindu
6e742ee6ac
Added scope beans
2016-07-26 16:40:04 +05:30
mharindu
564c2b280e
Fixed conflicts and merged
2016-07-26 16:38:51 +05:30
Chatura Dilan
7af8ecc686
Added userstore for role listing
2016-07-26 11:59:10 +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
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
Timo Briddigkeit
90910518d6
Fixed null pointer dereferences
2016-07-15 09:26:27 +02:00
Timo Briddigkeit
09020ccb9f
Fixed predictable pseudorandom number generator
2016-07-13 14:35:55 +02:00
mharindu
99664b23c5
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
2016-07-13 11:05:35 +05:30
Dilan U. Ariyaratne
ab5aa3e31c
Merge pull request #315 from madhawap/master
...
Added missing end-point to the permissions.xml
2016-07-12 10:28:38 +05:30
madhawap
0b338a1d25
Added missing end-point to the permissions.xml
2016-07-12 10:24:05 +05:30
mharindu
789086a667
Changed context paths
2016-07-12 01:31:35 +05:30
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