Commit Graph

131 Commits

Author SHA1 Message Date
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
thusithakalugamage
0d02e88955 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration 2016-09-09 18:42:46 +05:30
kamidu
878daae5c5 Permission modifications 2016-09-09 17:47:42 +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
hasuniea
d1e058ce8e fixing api-mgt upgrading issues 2016-08-26 17:40:30 +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
ayyoob
a7c201363c logged exception trace 2016-08-15 15:20:37 +05:30
mharindu
f5609cc8ff Adding carbon 4.4.7 migration changes 2016-08-11 12:19:05 +05:30
mharindu
ccdcea0109 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl 2016-08-01 12:27:25 +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
c71e5ead00 few fixes in JWT Client 2016-07-29 12:05:23 +05:30
Milan Perera
c49dc435e1 Merge pull request #319 from ayyoob/transport
Updated grant type implementation
2016-07-28 14:14:03 +05:30
ayyoob
d5e756c205 Updated Grant Type Implementation 2016-07-27 14:43:44 +05:30
ayyoob
250ce1f77c added device mgt grant types 2016-07-21 20:14:43 +05:30
mharindu
bdec8880bb Fixed conflicts and merged 2016-07-18 20:22:27 +05:30
Timo Briddigkeit
b674304087 Made constants real constant using final 2016-07-13 15:57:12 +02:00
Timo Briddigkeit
09020ccb9f Fixed predictable pseudorandom number generator 2016-07-13 14:35:55 +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
49623a4693 Implemented scope based authorization 2016-07-03 15:03:47 +05:30
ayyoob
0c2de7965f Added device scope validation 2016-06-20 02:33:17 +05:30
mharindu
50d35a90f8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-23 16:51:38 +05:30
mharindu
66ccad65cf Partial commit for APIM Gateway migration 2016-05-23 16:51:26 +05:30
mharindu
3e291c5b13 [maven-release-plugin] prepare for next development iteration 2016-05-20 16:43:16 +05:30
mharindu
9549ac446b [maven-release-plugin] prepare release v1.1.0 2016-05-20 16:43:02 +05:30
ayyoob
e8a66a7a37 resolved build issue 2016-05-19 02:46:05 +05:30
mharindu
52b300c06a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-19 00:42:27 +05:30
ayyoob
8a38abbae6 resolving create application issues 2016-05-19 00:26:34 +05:30
mharindu
49cb4787c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-18 11:49:35 +05:30
ayyoob
c0240c5cbc few fixes in JWT client after testing with multi tenancy 2016-05-18 02:09:12 +05:30
mharindu
f2ac5c5cad Implemented extended scope validator and improved webapp publisher to support Synapse 2016-05-16 11:46:30 +05:30
ayyoob
0b6acdc929 Added file seperator 2016-05-08 02:44:24 +05:30
ayyoob
5f302fce63 removed unused code and resolved host issues 2016-05-04 01:19:56 +05:30
geethkokila
c0dd2c423e Fixing the build failure on java 8 2016-04-29 22:44:01 +05:30
mharindu
c824e63f1e Refactored and fixed findbug issues in OAuth extension 2016-04-28 16:43:13 +05:30
mharindu
04fa0f4874 Implemented new password grant handler 2016-04-28 14:50:52 +05:30
mharindu
ffc7542d4d Modified authorization to support API gateway 2016-04-28 11:36:34 +05:30