Commit Graph

1071 Commits (20343d93497d15020e2781d6266c074d05438875)

Author SHA1 Message Date
mharindu 548f71ca2e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 49513ba79b Adding temporary development code bits for dashboard analytics feature
9 years ago
dilanua b9be51d50d Adding temporary development code bits for dashboard analytics feature
9 years ago
mharindu 6f8bb64e1c Fixed merge conflicts
9 years ago
mharindu ffc7542d4d Modified authorization to support API gateway
9 years ago
charithag 25ea00f26f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag b1683c1ccb Add capability to assign device in to a group and bug fixes
9 years ago
dilanua 053d14b317 Adding temporary development code bits for dashboard analytics feature
9 years ago
Ace a06327b731 refactoring and bug fixes
9 years ago
geethkokila 5a77e08fd5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag 6e84f0a5a3 Fix font issue
9 years ago
charithag 2a006684cc Fix formatting
9 years ago
charithag fb52c5845d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag bcbde92143 Update new analytics components.
9 years ago
dilanua 2a55c50ad1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 2b62eac4f5 Adding temporary development code bits for dashboard analytics feature
9 years ago
charithag 1e709bc394 Update new analytics components and remove obsoletes.
9 years ago
geethkokila 4029c86da4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 2fb42518b6 Adding the changes for the device group with policy.
9 years ago
charithag f6281c8ef0 Add jax-rs endpoints to modify and remove devices.
9 years ago
Charitha Goonetilleke 15a6e4b63b Fix formatting issues
9 years ago
charithag d8a9b642ff Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag 42d11b9d78 Add tenant aware dynamic units routing
9 years ago
prabathabey 52b81dd3eb Fixing compilation failures
9 years ago
prabathabey f5f177a858 Wrapping all device provisioning related info in ProvisioningConfig
9 years ago
Prabath Abeysekara 6ddd5db8cc Merge pull request #221 from ayyoob/das-ext
9 years ago
prabathabey 2133762792 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 95d3b97c5f Code cleanup
9 years ago
ayyoob e0f47cba19 Added device type specific graph loader
9 years ago
charithag 6d5635465e Add missing UI functionalities
9 years ago
Ruwan f04705dda5 Merge pull request #213 from charithag/patch-1
9 years ago
charithag 61b43ce5d8 Rename packages in device mgt jax-rs apis
9 years ago
Rasika Perera 22031c476c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag 646d87968c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag dfb7e9a9c8 Fix permissions
9 years ago
prabathabey aef892fece Code cleanup
9 years ago
prabathabey a10a693507 Fixing find bugs reported issues
9 years ago
prabathabey f2ba20baeb Code cleanup
9 years ago
prabathabey 47572d08f5 Removing obsolete dependencies to ApplicationManager interface from DeviceManagementService SPI
9 years ago
Rasika Perera 480d6d5b7e Remove redundant log messages
9 years ago
dilanua 7027a3553a Adding temporary development code bits for dashboard analytics feature
9 years ago
dilanua 2f2e8f391a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua c3bc22519a Adding temporary development code bits for dashboard analytics feature
9 years ago
ayyoob 5e1ad22480 few changes on download api
9 years ago
ayyoob 9f98f538de Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into das-ext
9 years ago
ayyoob b99d10e075 few changes invoker util to support file downloading
9 years ago
dilanua 274aa0ecd3 Adding temporary development code bits for cdmf-product dashboard feature
9 years ago
dilanua a888cf39c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Ruwan c6fbc8f1fe Merge pull request #216 from GPrathap/master
9 years ago
GPrathap 84492d70ac added constants for authentications types
9 years ago
GPrathap 55a95cca86 bug fixes
9 years ago
Rasika Perera 8e7052e012 adding JSON strigify on payload if contentType is json
9 years ago
Rasika Perera 69e38b3c98 adding JSON strigify on payload if contentType is json
9 years ago
Rasika Perera 6ec5b7a85a Reading Http Method from Features
9 years ago
Rasika Perera 2d44ec234b Now operations are auto generated and supports query params, path params and form params.
9 years ago
Rasika Perera bb33b4ea12 Parameterizing Content-Type and Accept headers.
9 years ago
charithag a5a1529853 Fix issues in device listing page and device details page
9 years ago
Charitha Goonetilleke 05858da548 Fix formatting
9 years ago
charithag c0e4c6b461 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag 6d8c3e5315 Fix default permission issues
9 years ago
charithag 516155dae5 Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
9 years ago
ayyoob afe965e787 adding code review changes on JWT and API App registration
9 years ago
dilanua 3daa42ca5d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag ab4b61401c Fixing UI and implementation issues occurred after restructuring.
9 years ago
charithag 4a72c789f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag 0133cddc68 Fixing UI and implementation issues occurred after restructuring.
9 years ago
dilanua c7af1a1e23 Adding temporary development code bits of dashboard analytics feature
9 years ago
dilanua ce8d4b53a2 Adding temporary development code bits of dashboard analytics feature
9 years ago
Lakshman 993a387e7c Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag 3dc23c5708 Fixing UI and implementation issues occurred after restructuring.
9 years ago
charithag 06a7fd2f1a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag 905f9ae4c1 Fixing UI issues occured after restructuring.
9 years ago
Kasun Delgolla 4e57e5bc85 Committing restructuring mdm-admin + UI merging style fixes
9 years ago
Lakshman 551aaf172b formatting change
9 years ago
Lakshman 7174d000e0 override hash and equals function in Device to avoid duplicates in collections
9 years ago
Ruwan a192bfa85c Merge pull request #207 from rasika90/master
9 years ago
Rasika Perera 3e34aeeff4 Fixing "Cannot write to cached file" issue
9 years ago
Rasika Perera 5911c873f3 Adding uuf template app
9 years ago
Kasun Delgolla 04de876265 Merge pull request #206 from charithag/master
9 years ago
charithag 99d004b6a6 Restructure group related UIs
9 years ago
Prabath Abeysekara 30e5666750 Merge pull request #205 from charithag/master
9 years ago
geethkokila d6923a1343 Fixing the issue in single condition
9 years ago
mharindu afbfaf4c1d Fixed for EMM-1305
9 years ago
mharindu a2a1e8115d Fixed conflicts and merged
9 years ago
mharindu 72591eff44 Fixed modify enrollment bug
9 years ago
geethkokila 7318502697 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila e60a383f4d Adding fixes to the device search
9 years ago
charithag f6d224a623 Refactor group management
9 years ago
charithag d22570dadb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag bf58342d81 Refactor group management
9 years ago
Prabath Abeysekara f1081f7029 Merge pull request #204 from ayyoob/merge-latest
9 years ago
ayyoob 3a3e9cc649 changed analytics components to released version
9 years ago
ayyoob 1b4a9227d8 merged web app publisher code and refactored jwt client extension to adhere to new artefact name
9 years ago
geethkokila 73a82f743f Adding the changes for device Info bean to stop returing null values and changes done for Device search unit classes
9 years ago
ayyoob 83057acd9a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
9 years ago
geethkokila fbc7c0807c Skipping the validation of task operations
9 years ago
ayyoob fc725fa767 removed analytics
9 years ago
ayyoob 81ae512f13 Merge pull request #6 from ayyoob/merge-devicetype
9 years ago
ayyoob 026d4ef018 removed analytics
9 years ago
charithag 0a8e00fd1e Merged with upstream and resolved conflicts.
9 years ago
charithag 3e4ccf6337 Add missing features and component from IoTS-1.0.0-M4
9 years ago
geethkokila 888971ae39 Fixing the oracl and postgres sql datasources and removing the start and end from the search context
9 years ago
charithag 2f0a3388a6 Implemented missing methods in group management.
9 years ago
geethkokila aa63b5f592 Fixing the application memory usage and adding location based search
9 years ago
charithag 3fd141acdf Add missing parts and test to group management.
9 years ago
charithag d1ee1fd578 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
charithag fa2f61f48a Add missing parts in group management
9 years ago
ayyoob 284a6645f0 import required packages
9 years ago
ayyoob 4554aadd82 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
ayyoob c45895685b Added device type multi tenancy capability.
9 years ago
ayyoob 021378df3b added org.wso2.carbon import package
9 years ago
ayyoob e06565728e removed duplicate imports and improper imports
9 years ago
charithag 062a843ca2 Fix for https://wso2.org/jira/browse/IOTS-99
9 years ago
prabathabey 22e579ff15 Fixing build failures causde by missing references to certain packages
9 years ago
prabathabey 3a7ef33c16 Fixing a build failure caused by unresolvable packages consumed by device.mgt.core and code cleanup
9 years ago
prabathabey 284ca1b8e8 Removing obsolete source structures
9 years ago
prabathabey 12c4ba10af Code cleanup
9 years ago
prabathabey 36161f6288 Merging extended device management functionalities
9 years ago
prabathabey 5e7985dae6 merging group-mgt implementation
9 years ago
prabathabey b584131160 Fixing build failures in device.mgt.analytics.data.publisher bundle
9 years ago
prabathabey 43926b64b4 Renaming previous org.wso2.carbon.devie.mgt.analytics module and the corresponding feature to org.wso2.carbon.device.mgt.analytics.data.publisher
9 years ago
prabathabey 1a43cf6a55 Fixing build faliure caused by not adding a package-import upon org.wso2.carbon.base
9 years ago
prabathabey 5dcd9dfe4a Merging device analytics feature impl to master
9 years ago
prabathabey e537e2d841 Adding device.mgt base ui framework
9 years ago
geethkokila e9da24c9e8 Changing the snapshot versions from 1.0.4 to 1.1.0
9 years ago
geethkokila 41191d6df0 Adding the search feature to device mgt plugin
9 years ago
geethkokila 1826c9ee49 Doing a partial commit for pull
9 years ago
geethkokila be890c2e9a Doing a partial commit
9 years ago
geethkokila 7a809c1c01 Doing a partial commit
9 years ago
prabathabey 3726a57d96 Making email-sender a separate component and code cleanup
9 years ago
prabathabey 0b31042aa2 More improvements to the email sending functionality
9 years ago
prabathabey 535c74a962 Improving email sender functionality
9 years ago
Dileesha Rajapakse 8ac485d66d Fixed Pagination issues in Device and Operation Oracle DAO classes
9 years ago
Dileesha Rajapakse 9204ed900d Fixed Pagination issues in Oracle DAO classes
9 years ago
Kamidu Sachith 370badf9d3 Preventing infromation leakage
9 years ago
geethkokila e0e0a57c11 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila cebb88e712 [maven-release-plugin] prepare release v1.0.3
9 years ago
geethkokila e66d291947 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila f416a73e75 [maven-release-plugin] prepare release v1.0.2
9 years ago
geethkokila 185a59fbd4 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila b3580d754b [maven-release-plugin] prepare release v1.0.1
9 years ago
prabathabey 1fe9371558 Fixing https://wso2.org/jira/browse/EMM-1133
9 years ago
prabathabey cbee88c7d0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey 77c4c34858 Fixing https://wso2.org/jira/browse/EMM-1133
9 years ago
harshanl 8d4c09c20f Fixed EMM-1139
9 years ago
harshanl 9a7093a0f7 Fixed EMM-1146 issue
9 years ago
prabathabey 7a27e88551 Changing the log levels configured in log4j.properties files used as part of test configurations
9 years ago
geethkokila 4e9255fbc9 [maven-release-plugin] prepare for next development iteration
9 years ago
geethkokila ceb60adb34 [maven-release-plugin] prepare release v1.0.0
9 years ago
Kamidu Sachith c6e2c01caa Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Kamidu Sachith 2d23eb86eb Improve runtime performance
9 years ago
harshanl a61fe6171a Refactored pagination code
9 years ago
Dileesha Rajapakse b25438097e Fixed issues in EnrollmentDAOImpl
9 years ago
harshanl 6441c201e5 Added search support for pagination
9 years ago
Dileesha Rajapakse eb680da572 Fixed EMM-1103
9 years ago
harshanl 91ece82eca Updated operation DAO to sort data in DESC order of timestamp.
9 years ago
harshanl d4b6ba5e36 Added pagination support for operation management apis.
9 years ago
harshanl 30e8dc885c Fixed EMM-1034
9 years ago
harshanl 73906f7cda Fixed EMM-1003
9 years ago
harshanl d95a198ad6 Fixed EMM-1001
9 years ago
Kamidu Sachith 53064516d3 Fix for the Jira Issue EMM-989
9 years ago
Kamidu Sachith 8573a284e0 Enable Domain name in the invitation main
9 years ago
manoj e1dc3d2ea3 add notify mechanisam to plugins for some operations - Ex -: IOS send push note to apns when add operation
9 years ago
manoj 99f82e4817 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl b4d17b888b fixed secondary user-store related issues & multi-tenancy issues
9 years ago
manoj a04658af14 App Manager integration
9 years ago
manoj 79c268cb41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dileesha Rajapakse 767ea70436 Refactored CommandOperation DAO class
9 years ago
Dileesha Rajapakse 8bd9295f81 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dileesha Rajapakse f3cfb79bac Refactored Operation DAO classes
9 years ago
harshanl f0471203e7 Added logic to skip device authorization for policy operations
9 years ago
Dileesha Rajapakse 6e95451f57 Refactored Operation DAO class
9 years ago
manoj dbf8d13ced Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
manoj 20db31c2a9 Add app manager features
9 years ago
Dileesha Rajapakse 825017a492 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dileesha Rajapakse 4379232c25 Refactored Enrollment DAO class
9 years ago
harshanl a3e20367f2 Fixed issue in Policy Task when DeviceAuthorization enabled.
9 years ago
Dileesha Rajapakse 6446be100d Refactored Policy Management DAO classes
9 years ago
Dileesha Rajapakse 91d9db1ffa Refactored ApplicationMapping and ProfileOperation DAO classes
9 years ago
Dileesha Rajapakse 27254cc922 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl cb02c9da80 Fixed issues in DeviceAuthorization
9 years ago
Dileesha Rajapakse 6f0276ab2f Modified Application Mapping DAO classes
9 years ago
Dileesha Rajapakse 7b2cfd69f5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl b9ca6705ae Merged changes
9 years ago
harshanl e14f09b8a8 Added requireDeviceAuthorization support
9 years ago
manoj fdc4ad8e18 Set user level autherization is support by plugin or not
9 years ago
manoj 22c2da7fcb Set user level autherization is support by plugin or not
9 years ago
manoj dc2e41e083 Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction
9 years ago
manoj adc3b652bf Add authentication method boolean check. Android allows user level authentication. IOS and windows allow device authetication. This is a temporary fix until fix windows and IOS certifcate level user extraction
9 years ago
Dileesha Rajapakse 786eb93bca Refactored Operation DAO classes
9 years ago
Dileesha Rajapakse 123ea228ad Refactored Enrolment DAO class
9 years ago
Dileesha Rajapakse 1975821446 Refactored Device and Application DAO classes
9 years ago
harshanl 5d107b0d56 Merged changes
9 years ago
harshanl 93e641893c Merged changes
9 years ago
harshanl 026a7c187a Fixed EMM-945, EMM-910, EMM-911, EMM-870
9 years ago
inosh-perera 4faa740c9d Fixing JIRA EMM-947 - only the registered device types are returned to UI
9 years ago
harshanl c826be9b3e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl 74a3b0e346 Fixed EMM-910
9 years ago
geethkokila 30c53b7d14 Fixing the EMM-900, Ading the LB host name and port to the email url
9 years ago
geethkokila 2479be9f5a Fixing the email client issue
9 years ago
Kasun Delgolla c00b1ee713 Committing fix for JIRA- EMM-860
9 years ago
prabathabey 90240e7d3f Merging https://github.com/wso2/carbon-device-mgt/pull/40 and resolving conflicts
9 years ago
harshanl 8a1dba166a Updated FeatureMgr spec
9 years ago
harshanl 340a690995 Added sql script
9 years ago
harshanl 1d4bba9807 License issue fixed
9 years ago
harshanl 09fbf9e8a1 Fixed DAO issues
9 years ago
harshanl 89e930d530 Fixed isssues in pagination
9 years ago
harshanl 25d7459974 Pagination changes
9 years ago
harshanl 155606a326 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
harshanl 81b6770c08 Fixed oauth issue with tenants
9 years ago
harshanl 6c196d5317 Added pagination support
9 years ago
harshanl 9a68aa92bc Removed the use of web-app context in permission.xml of webapps
9 years ago
harshanl d4eab9f86e Code refactored.
9 years ago
harshanl 429b738dba Fixed issues in permission tree'
9 years ago
harshanl 77f5f466d6 Added scope validator and refactored code
9 years ago
harshanl 648d8ec209 Added OAuth scope validator & fixed DataHolders
9 years ago
harshanl 234cd47931 Added identity-extensions
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
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
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 126c2ec371 Implemented permission authorizing module
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 517039cccb Partial commit
9 years ago
mharindu 2331b61bdc Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl bf0e95fa6c Fixed notification service issues
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 0e7ff3c0c8 Merged
9 years ago
hasuniea 581c4f013b refactored changes
9 years ago
mharindu 069c7e7c5f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
harshanl bbec523a47 Added notification mechanism
9 years ago
mharindu cbf10a8b59 Refactored addOperation method
9 years ago
hasuniea 7642112a9f code clean up
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