Commit Graph

164 Commits

Author SHA1 Message Date
WSO2 Builder
19c1b3566d [maven-release-plugin] prepare for next development iteration 2016-11-16 12:18:48 +00:00
WSO2 Builder
cff6e242c8 [maven-release-plugin] prepare release v2.0.0 2016-11-16 12:16:25 +00:00
charitha
a6064d2561 Update component versions for IoTS-1.0.0 release 2016-11-16 13:32:13 +05:30
WSO2 Builder
9517a3d30f [maven-release-plugin] prepare for next development iteration 2016-10-31 10:34:22 +00:00
WSO2 Builder
a8568299b9 [maven-release-plugin] prepare release v1.2.6 2016-10-31 10:32:11 +00:00
WSO2 Builder
27a2c9b979 [maven-release-plugin] prepare for next development iteration 2016-10-18 12:17:27 +00:00
WSO2 Builder
eae935f91c [maven-release-plugin] prepare release v1.2.5 2016-10-18 12:09:16 +00:00
WSO2 Builder
6a55e1be83 [maven-release-plugin] prepare for next development iteration 2016-10-17 14:15:22 +00:00
WSO2 Builder
11c2e59f61 [maven-release-plugin] prepare release v1.2.4 2016-10-17 14:13:25 +00:00
Chatura Dilan Perera
c16cc4cae1 [maven-release-plugin] prepare for next development iteration 2016-09-29 20:33:07 +05:30
Chatura Dilan Perera
ed4bca7032 [maven-release-plugin] prepare release v1.2.2 2016-09-29 20:32:59 +05:30
Ace
154a6082ce Merge remote-tracking branch 'upstream/master' into carbon-kernel-4.4.7
# Conflicts:
#	features/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework.server.feature/pom.xml
2016-09-22 19:08:21 +05:30
Chatura Dilan Perera
50d8885f8b [maven-release-plugin] prepare for next development iteration 2016-09-19 18:54:48 +05:30
Chatura Dilan Perera
a00d6aafd4 [maven-release-plugin] prepare release v1.2.1 2016-09-19 18:54:38 +05:30
Ace
6a8a5cbd5a Merging with master 2016-09-19 12:21:41 +05:30
Ace
1dfb8e22e1 Updating to latest appm/apim/identity dependencies 2016-09-14 17:23:09 +05:30
Chatura Dilan Perera
de23a8cf27 [maven-release-plugin] prepare for next development iteration 2016-09-09 20:18:25 +05:30
Chatura Dilan Perera
8905fae0d9 [maven-release-plugin] prepare release v1.2.0 2016-09-09 20:18:12 +05:30
Chatura Dilan Perera
2d5262e21e [maven-release-plugin] prepare for next development iteration 2016-09-09 17:10:19 +05:30
Chatura Dilan Perera
5ccd752404 [maven-release-plugin] prepare release v1.2.0 2016-09-09 17:10:04 +05:30
mharindu
115099c8fe Implemented permission based authorization 2016-09-09 02:56:21 +05:30
mharindu
24930b3042 Partial commit of migration 2016-09-05 16:37:09 +05:30
mharindu
d7e8cc30dd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7 2016-08-24 14:56:06 +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
mharindu
f5609cc8ff Adding carbon 4.4.7 migration changes 2016-08-11 12:19:05 +05:30
mharindu
bd41e4f4fb Implemented scope based authorization in device-mgt UI module 2016-08-09 19:08:07 +05:30
mharindu
acf6d7ecd7 Fixed conflicts and merged 2016-08-08 10:42:30 +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
84090fb16c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-29 12:39:05 +05:30
ayyoob
b57db836d3 removed error message 2016-07-28 16:16:52 +05:30
mharindu
3331604699 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-22 16:42:00 +05:30
madhawap
d79de070f1 fix to iOS device enrolment 2016-07-22 10:58:50 +05:30
mharindu
bdec8880bb Fixed conflicts and merged 2016-07-18 20:22:27 +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
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
Chatura Dilan
ffedcac543 [maven-release-plugin] prepare release v1.1.1 2016-07-08 19:09:55 +05:30
mharindu
cc5f677165 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-04 18:01:55 +05:30
hasuniea
bbbbb28795 removing unused packages 2016-07-04 16:51:36 +05:30
hasuniea
bf58c0bec3 add package changes to appAuthenticatorFrameworkServiceComponent.java 2016-07-04 16:45:36 +05:30
mharindu
60659ce15b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-07-04 14:09:44 +05:30
hasuniea
646e8b68d8 remove unwanted package 2016-07-04 12:40:48 +05:30
hasuniea
54498f41cd modifying scep utils 2016-07-04 12:24:28 +05:30
mharindu
49623a4693 Implemented scope based authorization 2016-07-03 15:03:47 +05:30
mharindu
5de4993319 Fixed URL tampering issue 2016-06-28 17:23:39 +05:30
ayyoob
ba6e202442 Few changes added after testing with the cluster 2016-06-27 00:12:46 +05:30
ayyoob
c5a997b1bf added missing imports 2016-06-06 10:42:31 +05:30