Commit Graph

310 Commits (ebead1249cf06234224b677a8709305d272ee8c4)

Author SHA1 Message Date
Madhawa Perera 4b128a6ebd Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Madhawa Perera d805245ffc added username field to the device certificate db and related changes
9 years ago
prabathabey 32cb32b706 modifying the name of the device management admin api war
9 years ago
prabathabey 30f6fc53b5 Merging the latest changes introduced in master
9 years ago
prabathabey 7e3865a233 Fixing admin webapp path in p2.inf
9 years ago
geethkokila f29cacffff Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 6365e5a8a9 Fixing activity the activity id
9 years ago
Dileesha Rajapakse 8821227de2 Fixed Oracle driver related syntax issues and table names
9 years ago
mharindu 3e291c5b13 [maven-release-plugin] prepare for next development iteration
9 years ago
mharindu 9549ac446b [maven-release-plugin] prepare release v1.1.0
9 years ago
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
charithag fa2f61f48a Add missing parts in group management
9 years ago
ayyoob c45895685b Added device type multi tenancy capability.
9 years ago
prabathabey 38f3b037eb Code cleanup
9 years ago
prabathabey 099613da73 Merging device.mgt.ui features
9 years ago
prabathabey e9954dab4b merging device.mgt.ui feature
9 years ago
prabathabey 284ca1b8e8 Removing obsolete source structures
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 5dcd9dfe4a Merging device analytics feature impl to master
9 years ago
geethkokila e9da24c9e8 Changing the snapshot versions from 1.0.4 to 1.1.0
9 years ago
geethkokila 3a3df04331 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila 41191d6df0 Adding the search feature to device mgt plugin
9 years ago
inosh-perera ef117ffa74 adding mutual SLL authentication and certificate management DAOs
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 3772d54ea1 Adding an entry to p2.inf to be able to copy them to a preferred location in the product distribution
9 years ago
prabathabey 0b31042aa2 More improvements to the email sending functionality
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
Dileesha Rajapakse edec1452b2 Fixed EMM-1171
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
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
pasinduj 08387e178d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Dileesha Rajapakse 9e5891a728 Fixed EMM-1116
9 years ago
pasinduj 5ac2447080 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
pasinduj bb010bde28 modified oracle db script to remove a foriegn key
9 years ago
Dileesha Rajapakse 96366de4dd Fixed syntax errors in sequence creation
9 years ago
pasinduj 4656a9eae7 modified all dbscripts removing a foriegn key
9 years ago
pasinduj 6e94a084a0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
pasinduj 6ed2710550 revert mysql edited lines
9 years ago
pasinduj 1a7b888102 modified dbscript added missing comma
9 years ago
pasinduj f49f13501f modified dbscripts removing policy ID forigen key from one table
9 years ago
pasinduj 3154582abe remove policy id foriegn key from one table
9 years ago
pasinduj a390df68ec modified dbscripts to remove foriegn key reference
9 years ago
Dileesha Rajapakse 799ece6b36 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila b3e2c856a9 Fixing the end point for invititaion
9 years ago
Dileesha Rajapakse 699d92f7bd Added DM_DEVICE_CERTIFICATE Table into SQL Scripts
9 years ago