prabathabey
|
30f6fc53b5
|
Merging the latest changes introduced in master
|
9 years ago |
|
prabathabey
|
ebefd60533
|
Renaming TenantConfiguration as PlatformConfiguration
|
9 years ago |
|
prabathabey
|
7e3865a233
|
Fixing admin webapp path in p2.inf
|
9 years ago |
Milan Perera
|
4462c353b4
|
Merge pull request #277 from ayyoob/transport
Fixed https://wso2.org/jira/browse/IOTS-177
|
9 years ago |
geethkokila
|
86e564713d
|
Adding the changes for getting activity ids which are changes after a certain time
|
9 years ago |
|
geethkokila
|
01e3cc4987
|
Fixing the activity related issues
|
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 |
hasuniea
|
ad7fa09e32
|
add certificate service
|
9 years ago |
|
prabathabey
|
6d33d7036b
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
|
prabathabey
|
0f5cf86d04
|
Adding the base path to be included in the swagger docs and appending the proper version to the webapp name
|
9 years ago |
Dilan U. Ariyaratne
|
dfe39e1b19
|
Merge pull request #278 from dilee/master
Fixed Oracle driver-related syntax issues and changed dashboard-related table names
|
9 years ago |
Dileesha Rajapakse
|
8821227de2
|
Fixed Oracle driver related syntax issues and table names
|
9 years ago |
ayyoob
|
5532db6dd4
|
Fixed https://wso2.org/jira/browse/IOTS-177
|
9 years ago |
inoshperera
|
aeec472805
|
Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements
|
9 years ago |
|
inoshperera
|
2959c05e1a
|
adding swagger annotations for device and activity APIs.
|
9 years ago |
|
Hasunie
|
e5586ea9fc
|
Merge pull request #276 from hasuniea/master
add SCEP csr signing feature
|
9 years ago |
|
hasuniea
|
c281b6a6f0
|
SCEP csr sign feature
|
9 years ago |
|
hasuniea
|
7281abf876
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
prabathabey
|
7e8f38cf16
|
Fixing conflicts while merging the latest changes in master
|
9 years ago |
|
prabathabey
|
e7bf0c7658
|
Resolving conflicts caused by merging with the updates in master
|
9 years ago |
|
prabathabey
|
8b9cf0da85
|
Resolving conflicts caused by merging with the updates in master
|
9 years ago |
|
prabathabey
|
29b3b965b0
|
Making all CDM-F REST APIs compatible with the REST API specifications
|
9 years ago |
|
Milan Perera
|
67e5a5a23a
|
Merge pull request #275 from GPrathap/master
added a bundleDef :net.minidev:json-smart
|
9 years ago |
GPrathap
|
c9c0a75430
|
added a bundleDef :net.minidev:json-smart
|
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 |
|
hasuniea
|
ad1a4cbd6a
|
fixed code conflicts
|
9 years ago |
|
hasuniea
|
e2e517d7ca
|
SCEP endpoint
|
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
Adding licence headers for server-side handlebar templates
|
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
|
7530a98f6b
|
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 |
|
Milan Perera
|
356c8f125e
|
Merge pull request #273 from ayyoob/transport
added webapp publisher missing bundle
|
9 years ago |
|
ayyoob
|
feaf6b2b35
|
added webapp publisher missing bundle
|
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
Release 1.1.0 and upgrading the versions
|
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 |
