Commit Graph

1863 Commits (bbff93adcc13599b1a406c82392aa355f1f1e5e4)

Author SHA1 Message Date
prabathabey 67c9ee0e70 Fixing commit conflict
8 years ago
prabathabey b24250f3f2 Returning device info within the device bean itself
8 years ago
hasuniea dc72fd1553 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
hasuniea e2cebcd430 removed If-Modified-Since header param
8 years ago
inoshperera ee948abc9d fixing conflicts and improving swagger annotations and validations
8 years ago
Shabirmean cbd42d2026 Changes to the certificate generators to fetch the Certificate alias from the Unique Identifier set in the CSR
8 years ago
inoshperera 5620e38681 adding proper error messages for APIs
8 years ago
prabathabey 92cf44380e Adding validations to certificate deletion operation
8 years ago
prabathabey fe22bfc125 Renaming 'recieved' to 'received'
8 years ago
prabathabey d32cd96a74 Fixing merge conflicts
8 years ago
prabathabey 9ebf705323 Re-enabling retrieval of device info
8 years ago
prabathabey e002ffb54a Re-enabling retrieval of device info
8 years ago
dilanua dada719486 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
dilanua 0bd2a46690 Adding H2/MSSQL/ORACLE/POSTGRESQL support for GET /admin/devices API
8 years ago
ayyoob 52c59c8e53 added permission updates on certificates
8 years ago
ayyoob aa6298b5e7 updated device management admin api permission
8 years ago
ayyoob d926bdaa34 removed unused permission from permission.xml
8 years ago
dilanua 07a4a65c7c Fixing permission issues with GET /devices/*/*/features API
8 years ago
dilanua 25e45dc9f1 Fixing issues in GET /operations and /admin/devices APIs
8 years ago
mharindu 7a029743ba Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
mharindu 81aa298740 Fixed RoleManagementService API issues
8 years ago
prabathabey 3cb9b5bae2 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey 61beca5048 Fixing getDevice method to support status, ownership, etc as query param filters
8 years ago
ayyoob 9f1de717c5 updated permissions in the permission.xml
8 years ago
mharindu 7aa37ff4d5 Fixed issues in RoleManagementService
8 years ago
mharindu 63ea40eb27 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
mharindu ce557266ec Fixed issues in RoleManagementService
8 years ago
ayyoob d9c15b62e7 few changes after testing user management api
8 years ago
Prabath Abeysekara 14322d4ba5 Merge pull request #283 from ayyoob/rest-api-improvements
8 years ago
ayyoob 5b8b15f69b fixed api issues in policy
8 years ago
prabathabey c9a2dc4399 Improving user management API implementation
8 years ago
prabathabey 627d99e913 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey 00a16ea2bc Improving Role management API implementation
8 years ago
dilanua 4a74ea8100 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
dilanua 374d509881 Updating DeviceManagementAdminServiceImpl
8 years ago
prabathabey 3e21c6d50d Improving ceritificate management webapp impl
8 years ago
Ace ddfd678b2a Adding user management API bug fixes and improvements
8 years ago
Ace d13368d144 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
Ace bfe215deac Adding changes and bug fixes to UserMgtService
8 years ago
Milan Perera 289fef040b Merge pull request #282 from ayyoob/rest-api-improvements
8 years ago
ayyoob d63e5e876b added password validation error msg
8 years ago
prabathabey 9c75252209 Updating permission.xml of certificate management admin service webapp with updated resource paths
8 years ago
prabathabey d65174d026 making the certificate management war adhere the REST API guidelines
8 years ago
mharindu cfe24229fc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
prabathabey f5aa2c5eb1 Improving swagger annotations added to certificate management service
8 years ago
prabathabey 1d4d0b7ae2 Improving certificate management webapp implementation
8 years ago
ayyoob 74a96015a7 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
ayyoob cf1e808cbd refactored after testing UserAdminManangmentService
8 years ago
hasuniea dfc673b08f Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
hasuniea 1443c7757e fixing code issues
8 years ago
prabathabey 9f48145614 Improving device admin service impl
8 years ago
prabathabey 697c727801 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey fc3d6cccbf Fixing Issues in notification management APIs
8 years ago
hasuniea 57d445237a add certificateMgtService
8 years ago
charitha 92a732cd41 Moved redundant texts to constants
8 years ago
geethkokila 3defcfe20d Fixing the applicationMgtAdminService for returing activity
8 years ago
charitha e2c03adec4 FIx for https://wso2.org/jira/browse/IOTS-169
8 years ago
prabathabey fbf213f77c Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey 20fd2ec768 Improving application installation/uninstallation handling
8 years ago
hasuniea 9c3c08b4ca fix UnAuthorizedDeviceAccessException.java
8 years ago
prabathabey af58e5ec88 Code cleanup
8 years ago
prabathabey 5ed982beb4 Adding more improvements to the JAX-RS APIs of CDM-F
8 years ago
prabathabey fd7a137b07 Improving jax-rs APIS of CDM-F
8 years ago
hasuniea 20343d9349 fixed swagger message issue
8 years ago
prabathabey 726a700528 Improving error handling in checking for monitoring frquency
8 years ago
prabathabey 6e5148a374 Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services
8 years ago
mharindu 71eb657e52 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
prabathabey 54f9d02ebb Code cleanup
8 years ago
prabathabey 77d4c167af code cleanup
8 years ago
geethkokila b7da99a621 Adding activity apis to get the updated once after a given time
8 years ago
prabathabey 2925f52cd8 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey 6d50ba14b1 Code cleanup
8 years ago
inoshperera db3dc0517b adding activity status related details.
8 years ago
prabathabey e1dfecb518 Changing the value of If-Modified-Since header as a string
8 years ago
prabathabey 76ec7bdc28 Improving swagger metada
8 years ago
prabathabey 425c0e7498 Improving swagger annotations of CDM-F core APIs further
8 years ago
geethkokila ed0da9e1d0 Fixing the device informations to get the applications
8 years ago
prabathabey 95458ce9b0 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey d92fb53dc9 Annotate APIs with 'Api' element to give users an abstract idea on what these APIs roughly do
8 years ago
geethkokila ecc8b5e6f2 Fixing the api issues
8 years ago
geethkokila 0221782533 Adding new apis for getting the device location when list of device identifiers are supplied
8 years ago
geethkokila 62c84319d8 Fixing the device search for application list
8 years ago
prabathabey 88cab5abf5 Fixing commit conflicts
8 years ago
prabathabey 37aa05f79c Committing improved swagger annotated cdm-f APIs
8 years ago
dilanua f4f47cbfdd Changing view names to fix oracle naming issues in dashboard analytics feature
8 years ago
geethkokila 6328d35797 Changing the device info object by adding the application list
8 years ago
Madhawa Perera 4b128a6ebd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Madhawa Perera d805245ffc added username field to the device certificate db and related changes
8 years ago
Hasunie 981db24ca8 Merge pull request #279 from hasuniea/master
8 years ago
inoshperera 3c73217e96 fixing osgi issue related to usage of carbon context. And adding api publishing check from config.
8 years ago
hasuniea 271170c26e refactored cert feature
8 years ago
inoshperera 1ffbb2183a adding permissions for DM services
8 years ago
ayyoob e03be5183d updated JWT Authenticator implementation to support tenancy
8 years ago
prabathabey 0b9c64594c Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey 32cb32b706 modifying the name of the device management admin api war
8 years ago
inoshperera 4623fa2269 swagger annotations added to APIs
8 years ago
prabathabey 30f6fc53b5 Merging the latest changes introduced in master
8 years ago
prabathabey ebefd60533 Renaming TenantConfiguration as PlatformConfiguration
8 years ago
ayyoob c9cd051a6b subscribed to super tenant apis
8 years ago
ayyoob e8b9f03748 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
Milan Perera 4462c353b4 Merge pull request #277 from ayyoob/transport
8 years ago
geethkokila 86e564713d Adding the changes for getting activity ids which are changes after a certain time
8 years ago
geethkokila 01e3cc4987 Fixing the activity related issues
8 years ago
hasuniea ad7fa09e32 add certificate service
8 years ago
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
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
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 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
mharindu 65612f724f Fixed compile issue
8 years ago
mharindu 8746c228f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
mharindu 2dbcf86f3d Added retrying mechanism to webapp publisher
8 years ago
prabathabey 9ec80bfe18 Fixing build failures caused by changed introduced to Operation Management APIs
8 years ago
dilanua b9a9fb3169 Adding class & method comments, constants to dashboard analytics feature
8 years ago
Ace 083e0f6eaa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Ace ecd386adf0 Fixing IOTS-160
8 years ago
ayyoob e8a66a7a37 resolved build issue
8 years ago
mharindu 52b300c06a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
mharindu 968cb00f35 Fixed conflicts and merged
8 years ago
sumedharubasinghe ae93e0c9a7 Merge pull request #268 from ayyoob/transport
8 years ago
mharindu 83c2a1f0ee Fixed issues in api publishing
8 years ago
ayyoob 8a38abbae6 resolving create application issues
8 years ago
prabathabey 5e03c5ed30 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
prabathabey a375252a94 Adding pluggable push notification framework
8 years ago
Ruwan 99c2446dc8 Merge pull request #267 from charithag/master
8 years ago
charitha 7eb111078a Fix for https://wso2.org/jira/browse/IOTS-110 MT issue
8 years ago
sumedharubasinghe 067f0a8050 Merge pull request #266 from ayyoob/transport
8 years ago
mharindu bca1b4b059 Fixed conflicts
8 years ago
mharindu 9f93570b29 Fixed issues in webapp-publisher
8 years ago
ayyoob ba47af3186 added api application registration filter
8 years ago
dilanua 7051af8d80 Adding relevant contextual names for database view names in dashboard analytics feature
8 years ago
geethkokila 958288f8ec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
geethkokila c7dd386c94 Adding new apis for device informations
8 years ago
dilanua 2886ead44b Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature
8 years ago
mharindu 49cb4787c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
mharindu 82b90522a0 Migrated to APIM 5.0.4
8 years ago
sumedharubasinghe 61ef87c658 Merge pull request #265 from rasika90/IOTS-114
8 years ago
Rasika Perera bc3f64a77a Fixing IOTS-114: the user is unable to deselect a child node permissions
8 years ago
charitha 075b5a8901 Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164
8 years ago
sumedharubasinghe 6a69a3a895 Merge pull request #261 from charithag/master
8 years ago
sumedharubasinghe 2f6c1dfbdd Merge pull request #263 from ayyoob/transport
8 years ago
ayyoob c0240c5cbc few fixes in JWT client after testing with multi tenancy
8 years ago
charitha aadf87e5d9 Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
8 years ago
Rasika Perera be970bfc9d Fixing IOTS-117 Domain needs to be marked as a mandatory field
8 years ago
mharindu 89026c2b7f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
charitha 6dc0a9dd38 Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario
8 years ago
mharindu 894e11c1c4 Fixed the JWT verifier issue
8 years ago
mharindu 9ebf2ab6d9 Merge branch 'apim' of https://github.com/milanperera/carbon-device-mgt
8 years ago
charitha ddc47cd862 Fix for https://wso2.org/jira/browse/IOTS-161
8 years ago
charitha 0ccaa9fe81 Fix for https://wso2.org/jira/browse/IOTS-50 & https://wso2.org/jira/browse/IOTS-112
8 years ago
mharindu 5ccc480ddb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
mharindu efc9fc3265 Fixed conflicts
8 years ago
mharindu 16a8f61f79 Refactored jwt authenticator
8 years ago
dilanua d5950afe7a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
dilanua c90f4471a8 Replacing .equals with .isEmpty empty string check in Detdashboard analytics feature
8 years ago
charitha 9480c71522 Fixed script error
8 years ago
charitha e0fc7c4018 Fix for https://wso2.org/jira/browse/IOTS-110
8 years ago
ayyoob cbdf5dd175 added a simple resolution for https://wso2.org/jira/browse/APIMANAGER-4504
8 years ago
ayyoob 2ceff61811 refactors jet authenticator to pick tenant specific key store
8 years ago
charitha 81524ae32c Fix for https://wso2.org/jira/browse/IOTS-156
8 years ago
mharindu ace6c2dbfc Fixed issues in JWT Authenticator
8 years ago
charitha 3d9ae8d1f6 Fix for https://wso2.org/jira/browse/IOTS-152
8 years ago
charitha e7c5ef78d0 Removed unnecessary jaggery apis
8 years ago
mharindu b77f5358e8 Removed external dependancies from webapp publisher component
8 years ago
mharindu 83ec18c38d Removed external dependancies from webapp publisher component
8 years ago
mharindu c68b92c7b4 Fixed conflicts
8 years ago
mharindu 9a4b904702 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
mharindu 659cdcc50c Implemented extended scope validator and improved webapp publisher to support Synapse
8 years ago
mharindu f2ac5c5cad Implemented extended scope validator and improved webapp publisher to support Synapse
8 years ago
Ruwan 8f0840e3df Merge pull request #254 from ayyoob/transport
8 years ago
ayyoob 168033b19d updated authentication in api
8 years ago
charitha 685c52a453 Bug fixes
8 years ago
Ace cbc505c459 changing profile name
8 years ago
Ace 4517a7f1aa Making API publish destination configurable and other changes
8 years ago
Ace 6d9f2f92a4 Making API publish destination configurable
8 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