community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,344 Commits 31 Branches 461 Tags 183 MiB
3457bba4a3
Commit Graph

2344 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
prabathabey
6d33d7036b Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-26 18:02:12 +05:30
prabathabey
0f5cf86d04 Adding the base path to be included in the swagger docs and appending the proper version to the webapp name 2016-05-26 18:00:45 +05:30
Dilan U. Ariyaratne
dfe39e1b19 Merge pull request #278 from dilee/master 
Fixed Oracle driver-related syntax issues and changed dashboard-related table names
 2016-05-26 17:18:57 +05:30
Dileesha Rajapakse
8821227de2 Fixed Oracle driver related syntax issues and table names 2016-05-26 17:15:35 +05:30
ayyoob
5532db6dd4 Fixed https://wso2.org/jira/browse/IOTS-177 2016-05-26 17:10:37 +05:30
inoshperera
aeec472805 Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-26 12:53:20 +05:30
inoshperera
2959c05e1a adding swagger annotations for device and activity APIs. 2016-05-26 12:52:49 +05:30
mharindu
52388ed33d Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-26 12:44:36 +05:30
mharindu
106be76118 Fixed issues of API publishing to gateway 2016-05-26 12:41:20 +05:30
Hasunie
e5586ea9fc Merge pull request #276 from hasuniea/master 
add SCEP csr signing feature
 2016-05-25 18:24:12 +05:30
hasuniea
c281b6a6f0 SCEP csr sign feature 2016-05-25 18:14:28 +05:30
hasuniea
7281abf876 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-25 18:11:29 +05:30
prabathabey
7e8f38cf16 Fixing conflicts while merging the latest changes in master 2016-05-25 17:59:12 +05:30
prabathabey
e7bf0c7658 Resolving conflicts caused by merging with the updates in master 2016-05-25 17:45:37 +05:30
prabathabey
8b9cf0da85 Resolving conflicts caused by merging with the updates in master 2016-05-25 17:37:21 +05:30
prabathabey
29b3b965b0 Making all CDM-F REST APIs compatible with the REST API specifications 2016-05-25 16:26:29 +05:30
Milan Perera
67e5a5a23a Merge pull request #275 from GPrathap/master 
added a bundleDef :net.minidev:json-smart
 2016-05-25 14:56:36 +05:30
GPrathap
c9c0a75430 added a bundleDef :net.minidev:json-smart 2016-05-25 14:39:59 +05:30
GPrathap
78475963e3 added entry for websocket url 2016-05-25 14:38:46 +05:30
inoshperera
deb4195f7a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-25 13:54:42 +05:30
hasuniea
ad1a4cbd6a fixed code conflicts 2016-05-25 13:51:46 +05:30
hasuniea
e2e517d7ca SCEP endpoint 2016-05-25 13:44:42 +05:30
inoshperera
a40e44899a syncing REST apis of core and product EMM 2016-05-25 12:38:24 +05:30
Ruwan
98f8ace1ff Merge pull request #274 from rasika90/master 
Adding licence headers for server-side handlebar templates
 2016-05-25 11:45:12 +05:30
geethkokila
c64a6e0ec5 Changing apis to return activity when an operation is added 2016-05-25 11:42:44 +05:30
Rasika Perera
d7f4a39075 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-25 11:34:51 +05:30
Rasika Perera
b879927dc1 Adding licence headers for handlebar templates 2016-05-25 11:28:24 +05:30
geethkokila
afba711969 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-25 08:16:14 +05:30
dilanua
7530a98f6b Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-24 18:27:06 +05:30
dilanua
339512e287 Updating comments in dashboard analytics feature 2016-05-24 18:26:47 +05:30
inoshperera
d7fe6d5e96 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-24 17:46:17 +05:30
Milan Perera
356c8f125e Merge pull request #273 from ayyoob/transport 
added webapp publisher missing bundle
 2016-05-24 15:44:17 +05:30
ayyoob
feaf6b2b35 added webapp publisher missing bundle 2016-05-24 15:35:48 +05:30
dilanua
4663d78060 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-23 17:14:52 +05:30
dilanua
47e17e4a51 Introducing more detailed exceptions, controlled filter-sets to dashboard analytics feature 2016-05-23 17:14:29 +05:30
mharindu
50d35a90f8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-23 16:51:38 +05:30
mharindu
66ccad65cf Partial commit for APIM Gateway migration 2016-05-23 16:51:26 +05:30
inosh
1341884957 resolving conflicts 2016-05-23 14:14:05 +05:30
inosh
60b42715d6 syncing admin api from product emm 2016-05-23 14:11:25 +05:30
geethkokila
16b809b255 Fixing the conflicts 2016-05-23 11:21:48 +05:30
geethkokila
1697a7ce85 Doing a partial commit for syncing the code base 2016-05-23 11:19:37 +05:30
geethkokila
ba25ecc6ef Doing a partial commit for syncing the code base 2016-05-23 11:19:22 +05:30
Prabath Abeysekara
830b3fc075 Merge pull request #272 from wso2/release-1.1.0 
Release 1.1.0 and upgrading the versions
 2016-05-23 10:08:13 +05:30
dilanua
8c4752ede3 Adding more comments to dashboard analytics data service interface 2016-05-22 16:54:07 +05:30
dilanua
975a3b915f Properly layering beans and custom exceptions in dashboard analytics feature 2016-05-22 08:12:25 +05:30
dilanua
a7c7452e2e Adding final updates to dashboard analytics feature 2016-05-20 17:10:37 +05:30
mharindu
3e291c5b13 [maven-release-plugin] prepare for next development iteration 2016-05-20 16:43:16 +05:30
mharindu
9549ac446b [maven-release-plugin] prepare release v1.1.0 2016-05-20 16:43:02 +05:30
Milan Perera
fe447f4325 Merge pull request #271 from milanperera/apim 
Refactored webapp publisher component
 2016-05-20 16:06:11 +05:30
mharindu
65612f724f Fixed compile issue 2016-05-20 16:02:56 +05:30