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 |
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 |
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 |
|
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 |
|
Milan Perera
|
fe447f4325
|
Merge pull request #271 from milanperera/apim
Refactored webapp publisher component
|
9 years ago |
|
mharindu
|
65612f724f
|
Fixed compile issue
|
9 years ago |
|
mharindu
|
8746c228f3
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
|
mharindu
|
2dbcf86f3d
|
Added retrying mechanism to webapp publisher
|
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
|
083e0f6eaa
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt
|
9 years ago |
|
Ace
|
ecd386adf0
|
Fixing IOTS-160
|
9 years ago |
|
Milan Perera
|
777d41a10d
|
Merge pull request #270 from ayyoob/transport
resolved build issue
|
9 years ago |
|
ayyoob
|
e8a66a7a37
|
resolved build issue
|
9 years ago |
|
Milan Perera
|
073ed252e7
|
Merge pull request #269 from milanperera/apim
Implemented API publishing to Synapse Gateway
|
9 years ago |
|
mharindu
|
52b300c06a
|
Merge branch 'master' of https://github.com/wso2/carbon-device-mgt into apim
|
9 years ago |
|
mharindu
|
968cb00f35
|
Fixed conflicts and merged
|
9 years ago |
sumedharubasinghe
|
ae93e0c9a7
|
Merge pull request #268 from ayyoob/transport
resolving create application issues
|
9 years ago |
|
mharindu
|
83c2a1f0ee
|
Fixed issues in api publishing
|
9 years ago |
|
ayyoob
|
8a38abbae6
|
resolving create application issues
|
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 |
|
Ruwan
|
99c2446dc8
|
Merge pull request #267 from charithag/master
Fix for https://wso2.org/jira/browse/IOTS-110 MT issue
|
9 years ago |
charitha
|
7eb111078a
|
Fix for https://wso2.org/jira/browse/IOTS-110 MT issue
|
9 years ago |
