Commit Graph

995 Commits (c68b92c7b44c9ef0b9d4ff13278eb25e6dea222f)

Author SHA1 Message Date
mharindu c68b92c7b4 Fixed conflicts
9 years ago
mharindu 9a4b904702 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
Ruwan 8f0840e3df Merge pull request #254 from ayyoob/transport
9 years ago
ayyoob 168033b19d updated authentication in api
9 years ago
charitha 685c52a453 Bug fixes
9 years ago
Ace cbc505c459 changing profile name
9 years ago
Ace 4517a7f1aa Making API publish destination configurable and other changes
9 years ago
Ace 6d9f2f92a4 Making API publish destination configurable
9 years ago
ayyoob b3075cf1bc removing application related roles
9 years ago
ayyoob 51d46213c2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
9 years ago
charitha 973e1ce40f Fix issues in group api
9 years ago
charitha 0a838923cb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa Perera 43648e4692 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa Perera b5741b420c Adding swagger annotations to beans
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
ayyoob 48912a05bb merged with upstream
9 years ago
prabathabey 9e4b4d2205 Improving swagger annotations
9 years ago
ayyoob bee9a106cc removed method and type from feature
9 years ago
inoshperera 50b5661a74 Merge pull request #245 from madhawap/master
9 years ago
Madhawa Perera fca80273bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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
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
Madhawa Perera 26c10f84ec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa Perera 66c12a8b1c Adding swagger annotations to beans
9 years ago
geethkokila 3bec779e0b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 362cf40d85 Fixing the operation activity id issues
9 years ago
inosh-perera 797c7a02d0 adding swagger annotation to beans
9 years ago
Madhawa 07c5362104 Adding swagger annotations to beans and some modifications to api interfaces
9 years ago
mharindu ed1eb217ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inosh-perera c945d63038 fixing issues in swagger dependancy
9 years ago
Madhawa 85f485df4c Few changes to interfaces with swagger annotations
9 years ago
Madhawa b6e7827920 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa fffc7f3205 Adding swagger annotations to beans
9 years ago
Hasunie 17f3a10ec4 Merge pull request #243 from hasuniea/master
9 years ago
ayyoob ec7727e8bf removed method and type from features
9 years ago
mharindu fd39b31369 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 1f21144668 Renamed EMM permission to CDMF
9 years ago
hasuniea e633d28013 added annotation for ConfigurationEntry
9 years ago
Madhawa ae13f7f889 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa 707da02c7e Adding swagger annotations to beans
9 years ago
Kasun Delgolla da1a60615c Merge pull request #239 from charithag/master
9 years ago
hasuniea e4dfe63548 code conflicts
9 years ago
hasuniea 1267db52ce added swagger annotations for TenantConfiguration
9 years ago
Milan Perera fb9c824e40 Merge pull request #241 from ayyoob/transport
9 years ago