Commit Graph

1060 Commits (d805245ffc56e5aef37d42815c6e405b3836cc24)

Author SHA1 Message Date
Milan Perera 67e5a5a23a Merge pull request #275 from GPrathap/master
9 years ago
GPrathap 78475963e3 added entry for websocket url
9 years ago
inoshperera deb4195f7a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
inoshperera a40e44899a syncing REST apis of core and product EMM
9 years ago
Ruwan 98f8ace1ff Merge pull request #274 from rasika90/master
9 years ago
geethkokila c64a6e0ec5 Changing apis to return activity when an operation is added
9 years ago
Rasika Perera d7f4a39075 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
Rasika Perera b879927dc1 Adding licence headers for handlebar templates
9 years ago
geethkokila afba711969 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 339512e287 Updating comments in dashboard analytics feature
9 years ago
inoshperera d7fe6d5e96 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 4663d78060 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
dilanua 47e17e4a51 Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature
9 years ago
inosh 1341884957 resolving conflicts
9 years ago
inosh 60b42715d6 syncing admin api from product emm
9 years ago
geethkokila 16b809b255 Fixing the conflicts
9 years ago
geethkokila 1697a7ce85 Doing a partial commit for syncing the code base
9 years ago
geethkokila ba25ecc6ef Doing a partial commit for syncing the code base
9 years ago
Prabath Abeysekara 830b3fc075 Merge pull request #272 from wso2/release-1.1.0
9 years ago
dilanua 8c4752ede3 Adding more comments to dashboard analytics data service interface
9 years ago
dilanua 975a3b915f Properly layering beans and custom exceptions in dashboard analytics feature
9 years ago
dilanua a7c7452e2e Adding final updates to dashboard analytics feature
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 65612f724f Fixed compile issue
9 years ago
prabathabey 9ec80bfe18 Fixing build failures caused by changed introduced to Operation Management APIs
9 years ago
dilanua b9a9fb3169 Adding class & method comments, constants to dashboard analytics feature
9 years ago
Ace ecd386adf0 Fixing IOTS-160
9 years ago
mharindu 968cb00f35 Fixed conflicts and merged
9 years ago
mharindu 83c2a1f0ee Fixed issues in api publishing
9 years ago
prabathabey 5e03c5ed30 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
prabathabey a375252a94 Adding pluggable push notification framework
9 years ago
sumedharubasinghe 067f0a8050 Merge pull request #266 from ayyoob/transport
9 years ago
mharindu bca1b4b059 Fixed conflicts
9 years ago
mharindu 9f93570b29 Fixed issues in webapp-publisher
9 years ago
ayyoob ba47af3186 added api application registration filter
9 years ago
dilanua 7051af8d80 Adding relevant contextual names for database view names in dashboard analytics feature
9 years ago
geethkokila 958288f8ec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
9 years ago
geethkokila c7dd386c94 Adding new apis for device informations
9 years ago
dilanua 2886ead44b Adding DataAccessLayerException to wrap SQLException in dashboard analytics feature
9 years ago
mharindu 49cb4787c0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
9 years ago
mharindu 82b90522a0 Migrated to APIM 5.0.4
9 years ago
sumedharubasinghe 61ef87c658 Merge pull request #265 from rasika90/IOTS-114
9 years ago
Rasika Perera bc3f64a77a Fixing IOTS-114: the user is unable to deselect a child node permissions
9 years ago
charitha 075b5a8901 Fix for https://wso2.org/jira/browse/IOTS-155 & https://wso2.org/jira/browse/IOTS-164
9 years ago
sumedharubasinghe 6a69a3a895 Merge pull request #261 from charithag/master
9 years ago
sumedharubasinghe 2f6c1dfbdd Merge pull request #263 from ayyoob/transport
9 years ago
ayyoob c0240c5cbc few fixes in JWT client after testing with multi tenancy
9 years ago
charitha aadf87e5d9 Bug fixes and fix for https://wso2.org/jira/browse/IOTS-158
9 years ago
Rasika Perera be970bfc9d Fixing IOTS-117 Domain needs to be marked as a mandatory field
9 years ago