Commit Graph

1942 Commits (6e2249419db4cdff716120097b6ea99f64cd6806)

Author SHA1 Message Date
Chatura Dilan bb6d2f2012 Fixed user search
8 years ago
madhawap d9b35c29cd swagger annotation fix to policy 'apply-changes' end point
8 years ago
madhawap 88feb5a852 Add Pagination to Notification end points
8 years ago
prabathabey 624e7df688 Improving HTTP status code handling and the resource implementations
8 years ago
prabathabey a23f44e682 Improving AcitivityManagement API implementation with proper error handling, etc
8 years ago
prabathabey ad6b95ff62 Code cleanup
8 years ago
prabathabey a46bd9194b Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey 4236744d39 Improving UserManagement and RoleManagement API implementations to return proper error codes when no role/user exists, etc
8 years ago
Dilan U. Ariyaratne a278b788d6 Merge pull request #308 from madhawap/rest-api-improvements
8 years ago
madhawap b50e007897 added /priorities end-point to PolicyManagement
8 years ago
madhawap 9c215c4ac9 added /priorities end-point to PolicyManagement
8 years ago
Ruwan 6ce7f8c65a Merge pull request #307 from ayyoob/transport
8 years ago
ayyoob ba6e202442 Few changes added after testing with the cluster
8 years ago
inoshperera 50009c7ac5 adding apply policy end point
8 years ago
inoshperera 16edca2aea fixing ios enrollment issue by fetching the identity certificate from the header.
8 years ago
madhawap ee11bde8b0 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
madhawap 235d690f1e Implemented 'offset' and 'limit' parameters to the 'operation' api
8 years ago
prabathabey 0c54753b34 Cleaning up UserManagementService API implementation
8 years ago
prabathabey f1eca17991 Code cleanup
8 years ago
prabathabey 9a7286a84b Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
8 years ago
prabathabey 3813856be8 Removing DeviceWrapper and all its associated usage, as it appeared to be a redundant element in the precense of 'Device'
8 years ago
prabathabey aeb4ad3295 Merging rest-api-improvements branch to master
8 years ago
geethkokila c07914eb36 Adding the activity count for the activty paginantion
8 years ago
geethkokila a67f432993 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
geethkokila 236eb90ce2 Fixing the limit and offset for activity
8 years ago
madhawap f2ab923df5 fix related to http status code in 'getDevices' endpoint
8 years ago
ayyoob ebebca8573 Added support for push notification for xmpp, mqtt and few changes to the after testing
8 years ago
ayyoob 0c2de7965f Added device scope validation
8 years ago
madhawap ea56d4ced3 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
madhawap 015ca0575e added 'updatedTimeStamp' to the Activity get response
8 years ago
ayyoob 1373e995fb added support to load device type configuration in base ui
8 years ago
dilanua 1513c6cf8a Adding isActive property to PolicyWrapper
8 years ago
madhawap 7cdb7dcee1 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
dilanua 0eed97e84c Adding API for getting device types
8 years ago
madhawap b3f95d19c1 add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
8 years ago
inoshperera 96eb71314b Merge pull request #297 from madhawap/rest-api-improvements
8 years ago
madhawap d7b860b955 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
madhawap 59119f9167 add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
8 years ago
ayyoob 7b2c04152f changed the UI calls from tomcat to apimgt gateway
8 years ago
Ace 7b62d2769e Changing response code returned when adding user
8 years ago
madhawap 3d416da6fe add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
8 years ago
geethkokila 626142a59b Fixing the isssue in retrieving the device info
8 years ago
Ace 016414c076 Bug fixes for role search
8 years ago
geethkokila d6501cbf8c Fixing the device search issues
8 years ago
hasuniea 629a0103d9 renaming scep web app
8 years ago
hasuniea 81aae9716d fixing certmgt issue
8 years ago
hasuniea ec3d032bc5 fixinf code issues
8 years ago
hasuniea 6471055c3f add refactored stuff
8 years ago
ayyoob b94eed267c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into transport
8 years ago
ayyoob 52e84273d1 added profile check before publishing apis
8 years ago
Shabirmean adec5cc303 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
Sahan Kariyawasam 35f43a60e7 Added Dashboard server url property
8 years ago
geethkokila 1fabb0eee3 Fixing the database syncing issue
8 years ago
Shabirmean a55dc9bce8 Adding necessary imports for the Certificate generation from CSR
8 years ago
Shabirmean 4380f7e242 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
8 years ago
mharindu de72cc21c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
mharindu 3858920d72 Changed HTTPS Url
8 years ago
ayyoob bb051deebc added https url for jaggery app deployment server
8 years ago
ayyoob c5a997b1bf added missing imports
8 years ago
mharindu a80ca2d696 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
8 years ago
GPrathap efb71d472a changing sso default state
8 years ago
GPrathap e23044d59d fixing jira:IOTS-195
8 years ago
mharindu f7c653b61c Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
mharindu 9eb2f5df86 Fixed foriegn key violation issue when getting pending operations
8 years ago
madhawap f80603a365 Fixes to if-modified-since in activity provider
8 years ago
Ace 4609888ad1 Fixes to ifmodified-since in activity provider
8 years ago
ayyoob 23ee3e25e7 updated the timestamp
8 years ago
geethkokila 42ce71da2c Fixing the spelling mistake
8 years ago
geethkokila 6aea69ae44 Fixing the duplicate issue
8 years ago
geethkokila efa74030b4 Fixing response duplicate issue
8 years ago
prabathabey 8819c6e36b Adding support for 'If-Modified-Since' header and 'since' query filter
8 years ago
inoshperera d71f0c6e6d Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
inoshperera 037acbe5bb fixing platform configuration appearing twice issue.
8 years ago
prabathabey 3c21583db6 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
prabathabey 1a29a9f58f Further fixing retrieving application list with device info
8 years ago
geethkokila ae887d6842 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
8 years ago
geethkokila a04300b3b6 Fixing the activity Id issue
8 years ago
prabathabey d3ce96585f Fixing issues in returning application list in the device response
8 years ago
geethkokila cc6883d955 Changing the if to a while loop, fixing the activity id issue
8 years ago
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