Commit Graph

1143 Commits (cebb88e71201dfe6a7af775c373c7346eeaa08fd)

Author SHA1 Message Date
geethkokila 20122b3f1e Fixing the roles and users adding issue
9 years ago
Kasun Delgolla c00b1ee713 Committing fix for JIRA- EMM-860
9 years ago
Kasun Delgolla 6f2d1ad065 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
harshanl 7cdd262b91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 7c0996270f Fixed EMM-887
9 years ago
Kasun Delgolla f519b7c029 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
prabathabey 90240e7d3f Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
9 years ago
Kasun Delgolla 9fa7c16e54 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
hasuniea 3de4718ab5 refactored certificate generator
9 years ago
harshanl 8a1dba166a Updated FeatureMgr spec
9 years ago
Dilshan Edirisuriya 5c2b7c9624 Removing commons codec version
9 years ago
Dilshan Edirisuriya bbc1132100 Commenting previous lines
9 years ago
Kasun Delgolla efa90b244f Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 0b800b8615 Bug fixes
9 years ago
Kasun Delgolla acdfc475be Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
hasuniea 8f595818dd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
hasuniea e1a24abfa3 refactored certificate service
9 years ago
geethkokila 168a011376 Fixing the issue of identity snapshot change
9 years ago
Kasun Delgolla f830a14a8b Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
harshanl b3e0f804b0 Added comments.
9 years ago
harshanl 52fab37c61 Fixed issue in permission validator
9 years ago
harshanl e1c9f1c602 Added url param support to permission tree.
9 years ago
Kasun Delgolla 3385bfacd2 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
hasuniea efd029083b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
hasuniea 2c2216e48d implement certificateManagement service
9 years ago
harshanl 340a690995 Added sql script
9 years ago
Kasun Delgolla 8d52735e6a Adding app list + info to monitoring operation
9 years ago
hasuniea 3a6e9f09fa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 1d4bba9807 License issue fixed
9 years ago
harshanl 09fbf9e8a1 Fixed DAO issues
9 years ago
harshanl 04eba0f313 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
hasuniea 53f4dc7ae5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
hasuniea 7a110a8eb5 implemented certificateGenerater
9 years ago
geethkokila c46c4f1be9 Fixing the policy update issues
9 years ago
harshanl 89e930d530 Fixed isssues in pagination
9 years ago
harshanl 25d7459974 Pagination changes
9 years ago
harshanl ca3653737c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 155606a326 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 703eebb715 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey a0ebec9f3d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey c74e27102f Fixing issues in adding license configs
9 years ago
inosh-perera cab888d321 fixing issues in oauth app creation, SAML. Moving service provider configuratiions to config files
9 years ago
harshanl 81b6770c08 Fixed oauth issue with tenants
9 years ago
geethkokila 182e15d632 Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master
9 years ago
Kamidu Sachith ddbd2c5372 Java 8 support
9 years ago
harshanl 9b40f73597 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila d15eb10636 Adding the null check to monitiring frequncy and fixing the servlet-api issue which is caused a compilation error
9 years ago
geethkokila f49345e722 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 8a8a152d36 Adding the policy task config
9 years ago
harshanl 0646b424ed Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 6c196d5317 Added pagination support
9 years ago
Dulitha Wijewantha 5962694ec2 Adding annotation for the description
9 years ago
Dulitha Wijewantha 002a1ec580 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
Dulitha Wijewantha 1025e9a425 Fixes to user api
9 years ago
Kamidu Sachith d5dcf44f27 Change the service registration
9 years ago
harshanl 2a6db0cdc4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila d52df2474e Fixing policy descriptions
9 years ago
harshanl 9a68aa92bc Removed the use of web-app context in permission.xml of webapps
9 years ago
geethkokila 9fca18ae90 Fixing the monitoring issue
9 years ago
harshanl b0d6038b69 Refactored dynamic client code & add tenancy handling to authenticators
9 years ago
Kamidu Sachith 5c215189d1 Enable java8 support
9 years ago
harshanl d9bcb617eb Merge branch 'master' of https://github.com/Kamidu/carbon-device-mgt into Kamidu-master
9 years ago
harshanl d4eab9f86e Code refactored.
9 years ago
geethkokila 81034c84f5 Fixing the method name issue in policy manager service
9 years ago
Kamidu Sachith a66949c7e0 Code Fixing
9 years ago
Kamidu Sachith 824f57b5d2 Change the code for better performance
9 years ago
Kamidu Sachith fe355b3184 Romoving Temporary Solutions
9 years ago
Kamidu Sachith 743f394fb9 Requested Modifications
9 years ago
Kamidu Sachith d932522d37 refactoring class
9 years ago
Kamidu Sachith 8cc38c87f5 requested modification
9 years ago
Kamidu Sachith 831fed6d38 Resolving imports
9 years ago
Dulitha Wijewantha 5e07e52be8 Merge branch 'master' of github.com:wso2/carbon-device-mgt
9 years ago
Dulitha Wijewantha 45ce4dbe4e Policy Updating
9 years ago
harshanl 741777682a Fixed dynamic client registration issues with server startup
9 years ago
Kamidu Sachith 786728b49b Recomended Changes to Enabling OAuth Authentication for BackEnd Services
9 years ago
Kamidu Sachith 97df36842d Enabling OAuth Authentication for BackEnd Services
9 years ago
harshanl 1c8bb7551d Refactored Dynamic-client registration service to use AppMgt osgi service
9 years ago
prabathabey 69ba3e83ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 774683a418 Adding proper dependency exclusions
9 years ago
harshanl 134a13727f updated cxf version & fixed migration issues
9 years ago
harshanl 36ca79d31a Fixed build issues
9 years ago
harshanl 302eb3a8a9 Merged changes
9 years ago
harshanl 429b738dba Fixed issues in permission tree'
9 years ago
harshanl f6c65dd481 Refactored dynamic-client registration code
9 years ago
harshanl 52e0a43b5e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 77f5f466d6 Added scope validator and refactored code
9 years ago
prabathabey c74a979c8d Bumping the versions of all dependent component versions to their respective latests
9 years ago
Dilshan Edirisuriya 0d259b2a6e Enabling SAML
9 years ago
harshanl 648d8ec209 Added OAuth scope validator & fixed DataHolders
9 years ago
harshanl 234cd47931 Added identity-extensions
9 years ago
milanperera 17112c3616 Removed unused constants
9 years ago
milanperera e408d50037 Refactored permission module
9 years ago
milanperera a0187b905b Removed unneccessary imports and code segments
9 years ago
milanperera a84edd7a99 Added seperate permission tree class
9 years ago
milanperera 02ad7fb8e1 Refactored authorization module
9 years ago
prabathabey d79de19176 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey bce52e54a3 Upgrading dependency versions to their respective latests
9 years ago
milanperera ed937467cd Refactored permission authorizer module
9 years ago
milanperera 68befaae01 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 335f53f01c refactored pom files
9 years ago
harshanl cb9616b02b Refactored dynamic-client registration
9 years ago
mharindu 9813816fab Fixed bug of adding operations
9 years ago
milanperera 1034eb85c6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 0a321e279a Added null check to getLicense
9 years ago
Dilshan Edirisuriya 9ce1c2002a Null check in DAO
9 years ago
milanperera 49016cbc56 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
milanperera 126c2ec371 Implemented permission authorizing module
9 years ago
Dilshan Edirisuriya c52dfb460a Removing import
9 years ago
milanperera 47ac0b1146 Fixed conflicts and merged local changes
9 years ago
Dilshan Edirisuriya ac5a7f4ab1 Null check in JWT authenticator and fixing tenant id issue in device DAO
9 years ago
milanperera 37854a2cef Partial Commit
9 years ago
Dilshan Edirisuriya 5f2ec88300 Changes in certificate managment
9 years ago
Dilshan Edirisuriya 3907c0fba2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 4a03c7abf7 certificate authentication changes
9 years ago
harshanl b8720917e1 Added Dynamic-client-registration module
9 years ago
milanperera 3de2591444 Partial commit
9 years ago
milanperera 517039cccb Partial commit
9 years ago
mharindu 9920f2919a Fixed spelling mistakes of policy component
9 years ago
mharindu b33925c497 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya e1a74e049d Bypassing URLS
9 years ago
Dilshan Edirisuriya d17f1356e7 Certificate authenticator changes
9 years ago
milanperera 3cb68355b4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu fbd697edb0 Fixed issue in policy delegation executor
9 years ago
mharindu 2331b61bdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 1193eff974 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl bf0e95fa6c Fixed notification service issues
9 years ago
Dilshan Edirisuriya ccffdb2252 Get attribute implementation
9 years ago
milanperera 3c89293220 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
milanperera 8d38c37d53 Fixed conflicts and merged
9 years ago
harshanl 330f059a09 Added App-Mgt config testcases
9 years ago
mharindu 3421663724 Fixed conflics and merged
9 years ago
geethkokila 4500aacd38 Adding the scep support for getting the device tenant id
9 years ago
mharindu 2f5ef48fa8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila d2fe9679e0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 11ead87a5e Fixing the policy listing issue
9 years ago
mharindu 0e7ff3c0c8 Merged
9 years ago
hasuniea 0c0d54f041 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
hasuniea 581c4f013b refactored changes
9 years ago
mharindu 59654848ef Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey bd6316d8b5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey dbf95bcc7c Fixing an issue in the logic of authentication incoming requests
9 years ago
milanperera 23bb023686 Partial Commit for Permission Authorizer module
9 years ago
mharindu 069c7e7c5f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 30dfa7600e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl bbec523a47 Added notification mechanism
9 years ago
prabathabey 46c5f2534f Fixing NoSuchElement exception thrown when standard context is accessed
9 years ago
mharindu 7a801c46eb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 6ef4bdd73e Fixing enrolment id issues
9 years ago
mharindu 5bcc020b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey dc2680ac5e Making APIPublisher util compose the relevant API endpoint url programmatically
9 years ago
prabathabey 256c42243f Improving APIPublisher implementation
9 years ago
prabathabey 9288e3846d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 4334994b36 Fixing issues encountered in APIPublisher implementation
9 years ago
harshanl d7ea5625bc Fixed apimgt publisher component issues
9 years ago
mharindu 6418c55f4f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila bdf976ad2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 7dd48bf00e Fixing the monitoring task for INACTIVE, BLOCKED, REMOVED, UNCLAIMED, DISENROLLMENT_REQUESTED, SUSPENDED devices
9 years ago
prabathabey 2f22d1c82a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey f2635e9e98 Adding more improvements into web-app authenticator framework
9 years ago
mharindu 97987f6e10 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu cbf10a8b59 Refactored addOperation method
9 years ago
hasuniea 7642112a9f code clean up
9 years ago
Prabath Abeysekara ee0e9af4cb Merge pull request #27 from milanperera/master
9 years ago
Dilshan Edirisuriya 673ef32535 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 454c459172 Extract certificate from signature
9 years ago
mharindu 0c43338f5d Added runtime exception to DCA
9 years ago
mharindu 1903b375f3 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey aa6f311d26 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 46c5dba5c5 Improving web-app authenticator framework
9 years ago
geethkokila dff526b272 Removing the unnessary commets and imports
9 years ago
geethkokila 5ee8c0f065 Fixing the cache manager issues
9 years ago
hasuniea 9d5f2af7e9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
mharindu 8503a997ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya aeae7a09f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 0140974487 Certificate verification
9 years ago
harshanl e1da84ec55 Added JWT authenticator
9 years ago
mharindu 725894ed2c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila f2b8f978f5 Fixing the operations connection close problems
9 years ago
mharindu cd853c9ee8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila f4b2a9ca3a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila b14461a5af Fixing the datasource issue in the device magt core
9 years ago
Dilshan Edirisuriya d2182e7375 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya d5199dbd62 Fixing issues
9 years ago
mharindu ad5335c9f5 Fixed local conflicts and merged
9 years ago
mharindu 6385c13012 Fixed issues in DeviceDAO
9 years ago
geethkokila 6c5f7d7ada Fixing conflicts and checkcriterion method
9 years ago
prabathabey 26cf4e82da Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 2b6bf203e2 Resolving conflicts observed in policy management implementation
9 years ago
geethkokila 044995ed97 Adding the activate method when policies are added.
9 years ago
mharindu a7e3462e91 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 39d1af7242 Saving in keystore
9 years ago
mharindu fd29deb372 Fixed conflicts of local repo and merged
9 years ago
prabathabey 892b9681f5 Fixing transaction handling issues
9 years ago
Dilshan Edirisuriya b391681438 Merge branches 'master' and 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dilshan Edirisuriya 3d736d628e adding conf file to touchpoint
9 years ago
geethkokila 458618191d Fixing datasource exaust issue, Fixing the enrolmentinfo getId method, adding policy cache manager. Changing the test cases
9 years ago
geethkokila c673395ce6 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 23c931f5f1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 20873e7786 Added null checks
9 years ago
Dilshan Edirisuriya c547d85f35 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago