Commit Graph

731 Commits

Author SHA1 Message Date
hasuniea
dfc673b08f Merge branch 'rest-api-improvements' of https://github.com/wso2/carbon-device-mgt into rest-api-improvements 2016-05-31 13:13:32 +05:30
hasuniea
1443c7757e fixing code issues 2016-05-31 13:13:01 +05:30
prabathabey
fc3d6cccbf Fixing Issues in notification management APIs 2016-05-31 12:49:51 +05:30
hasuniea
57d445237a add certificateMgtService 2016-05-31 12:48:26 +05:30
charitha
e2c03adec4 FIx for https://wso2.org/jira/browse/IOTS-169 2016-05-31 11:14:37 +05:30
prabathabey
af58e5ec88 Code cleanup 2016-05-30 16:42:10 +05:30
prabathabey
5ed982beb4 Adding more improvements to the JAX-RS APIs of CDM-F 2016-05-30 16:40:57 +05:30
prabathabey
fd7a137b07 Improving jax-rs APIS of CDM-F 2016-05-30 13:39:52 +05:30
prabathabey
6e5148a374 Fixing inconsistencies between what's represented via swagger and the real implementation, and bugs found in admin services 2016-05-30 08:21:59 +05:30
geethkokila
b7da99a621 Adding activity apis to get the updated once after a given time 2016-05-28 08:25:27 +05:30
geethkokila
0221782533 Adding new apis for getting the device location when list of device identifiers are supplied 2016-05-28 01:57:36 +05:30
geethkokila
62c84319d8 Fixing the device search for application list 2016-05-28 01:15:52 +05:30
geethkokila
6328d35797 Changing the device info object by adding the application list 2016-05-28 00:19:04 +05:30
prabathabey
ebefd60533 Renaming TenantConfiguration as PlatformConfiguration 2016-05-27 11:22:54 +05:30
Milan Perera
4462c353b4 Merge pull request #277 from ayyoob/transport
Fixed https://wso2.org/jira/browse/IOTS-177
2016-05-26 21:21:06 +05:30
geethkokila
86e564713d Adding the changes for getting activity ids which are changes after a certain time 2016-05-26 21:16:01 +05:30
geethkokila
01e3cc4987 Fixing the activity related issues 2016-05-26 18:44:12 +05:30
ayyoob
5532db6dd4 Fixed https://wso2.org/jira/browse/IOTS-177 2016-05-26 17:10:37 +05:30
geethkokila
c64a6e0ec5 Changing apis to return activity when an operation is added 2016-05-25 11:42:44 +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
mharindu
968cb00f35 Fixed conflicts and merged 2016-05-19 00:42:14 +05:30
prabathabey
a375252a94 Adding pluggable push notification framework 2016-05-19 00:20:45 +05:30
mharindu
bca1b4b059 Fixed conflicts 2016-05-18 22:01:38 +05:30
geethkokila
c7dd386c94 Adding new apis for device informations 2016-05-18 14:56:46 +05:30
mharindu
89026c2b7f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-17 20:33:23 +05:30
charitha
6dc0a9dd38 Fix for https://wso2.org/jira/browse/IOTS-110 multitenanted scenario 2016-05-17 18:40:39 +05:30
mharindu
5ccc480ddb Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-17 12:25:57 +05:30
charitha
e0fc7c4018 Fix for https://wso2.org/jira/browse/IOTS-110 2016-05-16 21:01:33 +05:30
mharindu
83ec18c38d Removed external dependancies from webapp publisher component 2016-05-16 14:20:34 +05:30
mharindu
c68b92c7b4 Fixed conflicts 2016-05-16 14:12:28 +05:30
mharindu
9a4b904702 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim 2016-05-16 11:55:35 +05:30
Ace
cbc505c459 changing profile name 2016-05-15 01:35:57 +05:30
Ace
4517a7f1aa Making API publish destination configurable and other changes 2016-05-15 01:15:11 +05:30
Ace
6d9f2f92a4 Making API publish destination configurable 2016-05-15 01:12:45 +05:30
Madhawa Perera
26c10f84ec Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
Adding swagger annotations to beans
2016-05-13 00:34:54 +05:30
Madhawa Perera
66c12a8b1c Adding swagger annotations to beans 2016-05-13 00:34:38 +05:30
geethkokila
362cf40d85 Fixing the operation activity id issues 2016-05-13 00:25:13 +05:30
mharindu
ed1eb217ea Merge branch 'master' of https://github.com/wso2/carbon-device-mgt 2016-05-12 23:03:15 +05:30
inosh-perera
c945d63038 fixing issues in swagger dependancy 2016-05-12 23:01:21 +05:30
Madhawa
fffc7f3205 Adding swagger annotations to beans 2016-05-12 22:12:23 +05:30
mharindu
1f21144668 Renamed EMM permission to CDMF 2016-05-12 22:00:15 +05:30
Madhawa
707da02c7e Adding swagger annotations to beans 2016-05-12 21:58:23 +05:30
dilanua
0534cd0a7e Adding h2, mysql, postgre-sql and oracle support to dashboard analytics feature 2016-05-10 18:52:44 +05:30
Rasika Perera
18edc21a04 Adding group permissions validation for operations 2016-05-04 04:14:09 +05:30
Rasika Perera
5c680b3f65 Fixing issue on group permission validating 2016-05-04 04:13:39 +05:30
Charitha Goonetilleke
8c62d9d64c Add authorization check for shared devices in groups 2016-05-04 00:07:48 +05:30
Charitha Goonetilleke
92784120bd Add group sharing UI functionality 2016-05-03 23:28:26 +05:30
Charitha Goonetilleke
b705352fb7 Merge branch 'master' of https://github.com/rasika90/carbon-device-mgt 2016-05-03 19:32:05 +05:30
Charitha Goonetilleke
f74a5b7a59 Merge remote-tracking branch 'rasika/master' 2016-05-03 19:31:31 +05:30