Commit Graph

2344 Commits (3457bba4a3386097f077c7b4554f02440a3f3b4c)
 

Author SHA1 Message Date
prabathabey 6d33d7036b Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey 0f5cf86d04 Adding the base path to be included in the swagger docs and appending the proper version to the webapp name
8 years ago
Dilan U. Ariyaratne dfe39e1b19 Merge pull request #278 from dilee/master
8 years ago
Dileesha Rajapakse 8821227de2 Fixed Oracle driver related syntax issues and table names
8 years ago
ayyoob 5532db6dd4 Fixed https://wso2.org/jira/browse/IOTS-177
8 years ago
inoshperera aeec472805 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
inoshperera 2959c05e1a adding swagger annotations for device and activity APIs.
8 years ago
mharindu 52388ed33d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
mharindu 106be76118 Fixed issues of API publishing to gateway
8 years ago
Hasunie e5586ea9fc Merge pull request #276 from hasuniea/master
8 years ago
hasuniea c281b6a6f0 SCEP csr sign feature
8 years ago
hasuniea 7281abf876 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
prabathabey 7e8f38cf16 Fixing conflicts while merging the latest changes in master
8 years ago
prabathabey e7bf0c7658 Resolving conflicts caused by merging with the updates in master
8 years ago
prabathabey 8b9cf0da85 Resolving conflicts caused by merging with the updates in master
8 years ago
prabathabey 29b3b965b0 Making all CDM-F REST APIs compatible with the REST API specifications
8 years ago
Milan Perera 67e5a5a23a Merge pull request #275 from GPrathap/master
8 years ago
GPrathap c9c0a75430 added a bundleDef :net.minidev:json-smart
8 years ago
GPrathap 78475963e3 added entry for websocket url
8 years ago
inoshperera deb4195f7a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
hasuniea ad1a4cbd6a fixed code conflicts
8 years ago
hasuniea e2e517d7ca SCEP endpoint
8 years ago
inoshperera a40e44899a syncing REST apis of core and product EMM
8 years ago
Ruwan 98f8ace1ff Merge pull request #274 from rasika90/master
8 years ago
geethkokila c64a6e0ec5 Changing apis to return activity when an operation is added
8 years ago
Rasika Perera d7f4a39075 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Rasika Perera b879927dc1 Adding licence headers for handlebar templates
8 years ago
geethkokila afba711969 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 7530a98f6b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 339512e287 Updating comments in dashboard analytics feature
8 years ago
inoshperera d7fe6d5e96 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Milan Perera 356c8f125e Merge pull request #273 from ayyoob/transport
8 years ago
ayyoob feaf6b2b35 added webapp publisher missing bundle
8 years ago
dilanua 4663d78060 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua 47e17e4a51 Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature
8 years ago
mharindu 50d35a90f8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu 66ccad65cf Partial commit for APIM Gateway migration
8 years ago
inosh 1341884957 resolving conflicts
8 years ago
inosh 60b42715d6 syncing admin api from product emm
8 years ago
geethkokila 16b809b255 Fixing the conflicts
8 years ago
geethkokila 1697a7ce85 Doing a partial commit for syncing the code base
8 years ago
geethkokila ba25ecc6ef Doing a partial commit for syncing the code base
8 years ago
Prabath Abeysekara 830b3fc075 Merge pull request #272 from wso2/release-1.1.0
8 years ago
dilanua 8c4752ede3 Adding more comments to dashboard analytics data service interface
8 years ago
dilanua 975a3b915f Properly layering beans and custom exceptions in dashboard analytics feature
8 years ago
dilanua a7c7452e2e Adding final updates to dashboard analytics feature
8 years ago
mharindu 3e291c5b13 [maven-release-plugin] prepare for next development iteration
8 years ago
mharindu 9549ac446b [maven-release-plugin] prepare release v1.1.0
8 years ago
Milan Perera fe447f4325 Merge pull request #271 from milanperera/apim
8 years ago
mharindu 65612f724f Fixed compile issue
8 years ago