charitha
|
ac30e7eb3e
|
Merge remote-tracking branch 'upstream/master' into IoTS-1.0.0
# Conflicts:
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/groups.hbs
# components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/pages/cdmf.page.groups/public/js/listing.js
|
8 years ago |
WSO2 Builder
|
9517a3d30f
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
a8568299b9
|
[maven-release-plugin] prepare release v1.2.6
|
8 years ago |
ayyoob
|
3140c36f7b
|
added missing license headers
|
8 years ago |
WSO2 Builder
|
27a2c9b979
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
eae935f91c
|
[maven-release-plugin] prepare release v1.2.5
|
8 years ago |
WSO2 Builder
|
6a55e1be83
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
WSO2 Builder
|
11c2e59f61
|
[maven-release-plugin] prepare release v1.2.4
|
8 years ago |
ayyoob
|
5727886ea1
|
few changes after apimgt integration
|
8 years ago |
harshanl
|
4bcf350236
|
EMM-1678:Updated the oauth component versions
|
8 years ago |
Chatura Dilan Perera
|
c16cc4cae1
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
ed4bca7032
|
[maven-release-plugin] prepare release v1.2.2
|
8 years ago |
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
|
8 years ago |
Chatura Dilan Perera
|
50d8885f8b
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
a00d6aafd4
|
[maven-release-plugin] prepare release v1.2.1
|
8 years ago |
Ace
|
6a8a5cbd5a
|
Merging with master
|
8 years ago |
Ace
|
1dfb8e22e1
|
Updating to latest appm/apim/identity dependencies
|
8 years ago |
Chatura Dilan Perera
|
de23a8cf27
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
8905fae0d9
|
[maven-release-plugin] prepare release v1.2.0
|
8 years ago |
thusithakalugamage
|
0d02e88955
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into theme-migration
|
8 years ago |
kamidu
|
878daae5c5
|
Permission modifications
|
8 years ago |
Chatura Dilan Perera
|
2d5262e21e
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
5ccd752404
|
[maven-release-plugin] prepare release v1.2.0
|
8 years ago |
mharindu
|
115099c8fe
|
Implemented permission based authorization
|
8 years ago |
mharindu
|
24930b3042
|
Partial commit of migration
|
8 years ago |
hasuniea
|
d1e058ce8e
|
fixing api-mgt upgrading issues
|
8 years ago |
mharindu
|
d7e8cc30dd
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.7
|
8 years ago |
Chatura Dilan Perera
|
8b17cbb339
|
Fix conflicts
|
8 years ago |
Chatura Dilan Perera
|
654e1d9938
|
[maven-release-plugin] prepare for next development iteration
|
8 years ago |
Chatura Dilan Perera
|
aa24821667
|
[maven-release-plugin] prepare release v1.1.2
|
8 years ago |
ayyoob
|
a7c201363c
|
logged exception trace
|
8 years ago |
mharindu
|
f5609cc8ff
|
Adding carbon 4.4.7 migration changes
|
8 years ago |
mharindu
|
ccdcea0109
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
9 years ago |
mharindu
|
84090fb16c
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into scope-impl
|
9 years ago |
ayyoob
|
c71e5ead00
|
few fixes in JWT Client
|
9 years ago |
Milan Perera
|
c49dc435e1
|
Merge pull request #319 from ayyoob/transport
Updated grant type implementation
|
9 years ago |
ayyoob
|
d5e756c205
|
Updated Grant Type Implementation
|
9 years ago |
ayyoob
|
250ce1f77c
|
added device mgt grant types
|
9 years ago |
mharindu
|
bdec8880bb
|
Fixed conflicts and merged
|
9 years ago |
Timo Briddigkeit
|
b674304087
|
Made constants real constant using final
|
9 years ago |
Timo Briddigkeit
|
09020ccb9f
|
Fixed predictable pseudorandom number generator
|
9 years ago |
mharindu
|
0f904e21d8
|
Fixed conflicts and merged
|
9 years ago |
Chatura Dilan
|
4ec11e8c08
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
Chatura Dilan
|
ffedcac543
|
[maven-release-plugin] prepare release v1.1.1
|
9 years ago |
mharindu
|
49623a4693
|
Implemented scope based authorization
|
9 years ago |
ayyoob
|
0c2de7965f
|
Added device scope validation
|
9 years ago |
mharindu
|
50d35a90f8
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
mharindu
|
66ccad65cf
|
Partial commit for APIM Gateway migration
|
9 years ago |
mharindu
|
3e291c5b13
|
[maven-release-plugin] prepare for next development iteration
|
9 years ago |
mharindu
|
9549ac446b
|
[maven-release-plugin] prepare release v1.1.0
|
9 years ago |