prabathabey
|
30f6fc53b5
|
Merging the latest changes introduced in master
|
9 years ago |
prabathabey
|
ebefd60533
|
Renaming TenantConfiguration as PlatformConfiguration
|
9 years ago |
geethkokila
|
86e564713d
|
Adding the changes for getting activity ids which are changes after a certain time
|
9 years ago |
geethkokila
|
01e3cc4987
|
Fixing the activity related issues
|
9 years ago |
prabathabey
|
6d33d7036b
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
prabathabey
|
0f5cf86d04
|
Adding the base path to be included in the swagger docs and appending the proper version to the webapp name
|
9 years ago |
inoshperera
|
aeec472805
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
inoshperera
|
2959c05e1a
|
adding swagger annotations for device and activity APIs.
|
9 years ago |
prabathabey
|
7e8f38cf16
|
Fixing conflicts while merging the latest changes in master
|
9 years ago |
prabathabey
|
e7bf0c7658
|
Resolving conflicts caused by merging with the updates in master
|
9 years ago |
prabathabey
|
8b9cf0da85
|
Resolving conflicts caused by merging with the updates in master
|
9 years ago |
prabathabey
|
29b3b965b0
|
Making all CDM-F REST APIs compatible with the REST API specifications
|
9 years ago |
inoshperera
|
deb4195f7a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
inoshperera
|
a40e44899a
|
syncing REST apis of core and product EMM
|
9 years ago |
inosh
|
1341884957
|
resolving conflicts
|
9 years ago |
inosh
|
60b42715d6
|
syncing admin api from product emm
|
9 years ago |
geethkokila
|
16b809b255
|
Fixing the conflicts
|
9 years ago |
geethkokila
|
1697a7ce85
|
Doing a partial commit for syncing the code base
|
9 years ago |
geethkokila
|
ba25ecc6ef
|
Doing a partial commit for syncing the code base
|
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 |
mharindu
|
65612f724f
|
Fixed compile issue
|
9 years ago |
prabathabey
|
9ec80bfe18
|
Fixing build failures caused by changed introduced to Operation Management APIs
|
9 years ago |
mharindu
|
968cb00f35
|
Fixed conflicts and merged
|
9 years ago |
mharindu
|
83c2a1f0ee
|
Fixed issues in api publishing
|
9 years ago |
prabathabey
|
a375252a94
|
Adding pluggable push notification framework
|
9 years ago |
mharindu
|
bca1b4b059
|
Fixed conflicts
|
9 years ago |
mharindu
|
9f93570b29
|
Fixed issues in webapp-publisher
|
9 years ago |
geethkokila
|
c7dd386c94
|
Adding new apis for device informations
|
9 years ago |
mharindu
|
49cb4787c0
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
mharindu
|
82b90522a0
|
Migrated to APIM 5.0.4
|
9 years ago |
charitha
|
aadf87e5d9
|
Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
|
9 years ago |
mharindu
|
9ebf2ab6d9
|
Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt
|
9 years ago |
charitha
|
0ccaa9fe81
|
Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112
|
9 years ago |
mharindu
|
9a4b904702
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
charitha
|
685c52a453
|
Bug fixes
|
9 years ago |
ayyoob
|
b3075cf1bc
|
removing application related roles
|
9 years ago |
charitha
|
973e1ce40f
|
Fix issues in group api
|
9 years ago |
prabathabey
|
71180e686e
|
Improving swagger annotations
|
9 years ago |
prabathabey
|
a0dbb25824
|
Fixing code conflicts and improving swagger annotations
|
9 years ago |
Madhawa Perera
|
e75afb8020
|
Adding swagger annotations to beans
|
9 years ago |
prabathabey
|
9e4b4d2205
|
Improving swagger annotations
|
9 years ago |
inoshperera
|
50b5661a74
|
Merge pull request #245 from madhawap/master
Added swagger annotations to beans
|
9 years ago |
Madhawa Perera
|
fca80273bc
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
inosh-perera
|
b2383617e1
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
inosh-perera
|
0cf0ec6e77
|
adding swagger annotations to APIs
|
9 years ago |
Madhawa Perera
|
6227e93d2f
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
|
9 years ago |
Madhawa Perera
|
087adafeb7
|
Adding swagger annotations to beans
|
9 years ago |
geethkokila
|
ccea046240
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
geethkokila
|
4e4e660fa1
|
Adding the swagger documentation to the activity id resource
|
9 years ago |