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 |
|
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
|
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 |
|
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 |
|
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 |
|
mharindu
|
65612f724f
|
Fixed compile issue
|
2016-05-20 16:02:56 +05:30 |
|
mharindu
|
8746c228f3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-20 15:53:06 +05:30 |
|
mharindu
|
2dbcf86f3d
|
Added retrying mechanism to webapp publisher
|
2016-05-20 15:52:50 +05:30 |
|
prabathabey
|
9ec80bfe18
|
Fixing build failures caused by changed introduced to Operation Management APIs
|
2016-05-20 12:43:47 +05:30 |
|
dilanua
|
b9a9fb3169
|
Adding class & method comments, constants to dashboard analytics feature
|
2016-05-19 12:37:12 +05:30 |
|
Ace
|
083e0f6eaa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-19 08:22:54 +05:30 |
|
Ace
|
ecd386adf0
|
Fixing IOTS-160
|
2016-05-19 08:22:29 +05:30 |
|
ayyoob
|
e8a66a7a37
|
resolved build issue
|
2016-05-19 02:46:05 +05:30 |
|
mharindu
|
52b300c06a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
2016-05-19 00:42:27 +05:30 |
|
mharindu
|
968cb00f35
|
Fixed conflicts and merged
|
2016-05-19 00:42:14 +05:30 |
|
sumedharubasinghe
|
ae93e0c9a7
|
Merge pull request #268 from ayyoob/transport
resolving create application issues
|
2016-05-19 00:40:20 +05:30 |
|
mharindu
|
83c2a1f0ee
|
Fixed issues in api publishing
|
2016-05-19 00:30:41 +05:30 |
|
ayyoob
|
8a38abbae6
|
resolving create application issues
|
2016-05-19 00:26:34 +05:30 |
|
prabathabey
|
5e03c5ed30
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
2016-05-19 00:20:57 +05:30 |
|
prabathabey
|
a375252a94
|
Adding pluggable push notification framework
|
2016-05-19 00:20:45 +05:30 |
|
Ruwan
|
99c2446dc8
|
Merge pull request #267 from charithag/master
Fix for https://wso2.org/jira/browse/IOTS-110 MT issue
|
2016-05-19 00:14:33 +05:30 |
|
charitha
|
7eb111078a
|
Fix for https://wso2.org/jira/browse/IOTS-110 MT issue
|
2016-05-19 00:07:40 +05:30 |
|
sumedharubasinghe
|
067f0a8050
|
Merge pull request #266 from ayyoob/transport
added api application registration filter
|
2016-05-18 23:17:43 +05:30 |
|