Commit Graph

1524 Commits (16b809b2550dddbe331d505b6ca3909492959a99)

Author SHA1 Message Date
mharindu 5ccc480ddb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
mharindu efc9fc3265 Fixed conflicts
9 years ago
mharindu 16a8f61f79 Refactored jwt authenticator
9 years ago
dilanua d5950afe7a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua c90f4471a8 Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature
9 years ago
charitha 9480c71522 Fixed script error
9 years ago
charitha e0fc7c4018 Fix for https://wso2.org/jira/browse/IOTS-110
9 years ago
ayyoob cbdf5dd175 added a simple resolution for https://wso2.org/jira/browse/APIMANAGER-4504
9 years ago
ayyoob 2ceff61811 refactors jet authenticator to pick tenant specific key store
9 years ago
charitha 81524ae32c Fix for https://wso2.org/jira/browse/IOTS-156
9 years ago
mharindu ace6c2dbfc Fixed issues in JWT Authenticator
9 years ago
charitha 3d9ae8d1f6 Fix for https://wso2.org/jira/browse/IOTS-152
9 years ago
charitha e7c5ef78d0 Removed unnecessary jaggery apis
9 years ago
mharindu b77f5358e8 Removed external dependancies from webapp publisher component
9 years ago
mharindu 83ec18c38d Removed external dependancies from webapp publisher component
9 years ago
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
mharindu 659cdcc50c Implemented extended scope validator and improved webapp publisher to support Synapse
9 years ago
mharindu f2ac5c5cad Implemented extended scope validator and improved webapp publisher to support Synapse
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
Madhawa Perera 94aacb1625 Adding swagger annotations to beans
9 years ago
Madhawa Perera fca80273bc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa Perera 5d1bf67630 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
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
inoshperera 97db3e42d6 Merge pull request #242 from madhawap/master
9 years ago
inosh-perera 5597c752ac Adding sawgger annotations to admin Jax-rs apis.
9 years ago
Madhawa 783d5e1746 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa b407797ab0 added swagger annotation to the interfaces
9 years ago
ayyoob 34f1f4dfe2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
9 years ago
inoshperera cdb91924e2 Merge pull request #240 from madhawap/master
9 years ago
Madhawa 36c3a057dc created interfaces for the api classes in order add swagger definitions
9 years ago
inosh-perera db5dafa9e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inosh-perera 67b210fe86 adding mutual ssl support in clustered setup
9 years ago
Madhawa f5915cbf5d created interfaces for the api classes in order add swagger definitions
9 years ago
Madhawa 46e0c4ea8b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa 7b04d9f0b0 created interfaces for the api classes in order add swagger definitions
9 years ago
ayyoob ac587c3353 fixes after testing
9 years ago
dilanua bb3bcdfd2d Adding device-identification attribute for DetailedDeviceEntry in dashboard analytics feature
9 years ago
charitha 18957b0110 Add required jagerry modules for the app
9 years ago
charitha 0c8f1ce770 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charitha 73222e347b Fixed https://wso2.org/jira/browse/IOTS-104
9 years ago
hasuniea a675c02350 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 14c07846b2 Adding mssql support to dashboard analytics feature
9 years ago
prabathabey 285c870d6a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey bc894f2517 Adding Swagger-annotation dependency to carbon-device-mgt
9 years ago
hasuniea c98a162174 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu b58e2b13c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 5ad8d2938e Fixed issues of publishing APIs to synapse gateway
9 years ago
Ruwan 93b1d618b6 Merge pull request #237 from charithag/master
9 years ago
charitha 576a7d83ad Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charitha 7ff993a7b7 Enable group analytics
9 years ago
dilanua 4cabe359a0 Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
9 years ago
dilanua 0534cd0a7e Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature
9 years ago
dilanua adec59e934 Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature
9 years ago
dilanua 2a9e2a47e8 Adding inter-mediate code improvements to dashboard analytics feature
9 years ago
dilanua 0ab4035b37 Adding H2, MySQL Support for dashboard analytics feature
9 years ago