Commit Graph

250 Commits (9ec80bfe1877692460e71840bff54cf9d38db982)

Author SHA1 Message Date
mharindu 968cb00f35 Fixed conflicts and merged
9 years ago
prabathabey a375252a94 Adding pluggable push notification framework
9 years ago
mharindu bca1b4b059 Fixed conflicts
9 years ago
dilanua 7051af8d80 Adding relevant contextual names for database view names in dashboard analytics feature
9 years ago
mharindu 5ccc480ddb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
charitha 25cff47335 Moved email templates to emm base plugin as they are related to emm
9 years ago
mharindu 9a4b904702 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
charitha 0a838923cb 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
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
charitha 18957b0110 Add required jagerry modules for the app
9 years ago
dilanua e151bca0c7 Adding device-identification attribute for database views in dashboard analytics feature
9 years ago
dilanua 754195bee6 Adding mssql support to dashboard analytics feature
9 years ago
Dilan U. Ariyaratne c9eed309aa Merge pull request #238 from dilee/master
9 years ago
Dileesha Rajapakse e055519d4c Fixed errors in MSSQL DB script
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
dilanua adec59e934 Adding inter-mediate postgre-sql and oracle support to dashboard analytics feature
9 years ago
Dileesha Rajapakse cb5736854a Fixed issues in Oracle DB script
9 years ago
Dileesha Rajapakse de08e96646 Fixed errors in PostgreSQL script
9 years ago
dilanua 13c5fe3d1b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 0ab4035b37 Adding H2, MySQL Support for dashboard analytics feature
9 years ago
Kasun Delgolla 4cb7b86f4c Fixing SQL errors
9 years ago
geethkokila e4b400a5e7 Disabling device analytics publishing by default
9 years ago
geethkokila 3396a5066d Adding changes for the updated time of device info and device location
9 years ago
geethkokila 5a77e08fd5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
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
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
prabathabey 95d3b97c5f Code cleanup
9 years ago
geethkokila f1aeb1a846 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 37e431d6a0 Adding the h2.sql for resolving conflicts
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
charithag 516155dae5 Moved devicemgt_admin jax-rs to device-mgt from carbon-devicemgt-plugins
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
Kasun Delgolla 4e57e5bc85 Committing restructuring mdm-admin + UI merging style fixes
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
ayyoob 1b4a9227d8 merged web app publisher code and refactored jwt client extension to adhere to new artefact name
9 years ago
ayyoob 83057acd9a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into merge-latest
9 years ago
inosh-perera 41ba2f4f0a adding database changes
9 years ago
ayyoob 81ae512f13 Merge pull request #6 from ayyoob/merge-devicetype
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
geethkokila aa63b5f592 Fixing the application memory usage and adding location based search
9 years ago