Commit Graph

1505 Commits

Author SHA1 Message Date
Kasun Delgolla
86327ab870 Committing android service improvements + integration 2016-05-26 15:35:26 +05:30
prabathabey
03a21752e2 Adding maven-compiler-plugin to the build profile 2016-05-26 11:14:31 +05:30
hasuniea
9f33110e6f Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 18:16:11 +05:30
Milan Perera
ab2c675596 Merge pull request #282 from GPrathap/master
added some bundles which required for this feature
2016-05-25 15:11:10 +05:30
GPrathap
ef801d6d08 fixed the formatting issue 2016-05-25 15:07:26 +05:30
GPrathap
7c494d7bc0 added some bundles which required for this feature 2016-05-25 14:57:38 +05:30
GPrathap
2e10d2ba2b added some bundles which required for this feature 2016-05-25 14:42:54 +05:30
hasuniea
ab70703da8 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 13:54:12 +05:30
hasuniea
2eb5aebb60 fixed code issues in EventService 2016-05-25 13:53:39 +05:30
Ruwan
9e8e479d63 Merge pull request #281 from rasika90/master
Adding licence headers for server-side handlebar templates
2016-05-25 11:45:16 +05:30
geethkokila
57a9834145 Changing apis to return activity when an operation is added 2016-05-25 11:43:19 +05:30
Rasika Perera
f0b5ad32c9 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-25 11:35:27 +05:30
Rasika Perera
c49e19a3c6 Adding licence headers for handlebar templates 2016-05-25 11:34:22 +05:30
Milan Perera
028a9b106a Merge pull request #280 from ayyoob/transport
added UI output adapter
2016-05-24 19:35:24 +05:30
ayyoob
b7748b0001 added UI output adapter 2016-05-24 19:28:47 +05:30
Kasun Delgolla
4f33789d38 Committing MDM android APIs responses standardization 2016-05-24 15:34:43 +05:30
Hasunie
df6f420d6e Merge pull request #279 from hasuniea/master
fixed code issues
2016-05-23 15:11:15 +05:30
hasuniea
4757ac797c fixed code issues 2016-05-23 15:09:33 +05:30
Prabath Abeysekara
280bea758b Merge pull request #278 from ayyoob/transport
Version Upgrade
2016-05-23 10:26:24 +05:30
ayyoob
c956e6da7f device mgt version is upgraded 2016-05-23 10:24:11 +05:30
ayyoob
dc32a8f8d3 Merge branch 'release-2.1.0' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-23 10:18:46 +05:30
Hasunie
aa1e64738f Merge pull request #276 from hasuniea/master
sync code
2016-05-23 09:52:57 +05:30
Shabirmean
75914aee4e Changes to the VirtualFirealarm Agent + the API to enable token refresh upon expiration 2016-05-21 01:46:34 +05:30
mharindu
f3730c64ae [maven-release-plugin] prepare for next development iteration 2016-05-20 17:49:18 +05:30
mharindu
7a982093a1 [maven-release-plugin] prepare release v2.1.0 2016-05-20 17:49:08 +05:30
mharindu
862075bd2f Removed maven clean plugin 2016-05-20 17:45:40 +05:30
mharindu
be4078cf38 [maven-release-plugin] rollback the release of v2.1.0 2016-05-20 17:35:17 +05:30
mharindu
a2d2f26123 [maven-release-plugin] prepare for next development iteration 2016-05-20 17:26:28 +05:30
mharindu
3af112898d [maven-release-plugin] prepare release v2.1.0 2016-05-20 17:26:19 +05:30
mharindu
22ac893152 Upgraded carbon-device-mgt to 1.1.0 2016-05-20 17:12:16 +05:30
hasuniea
a48529be59 fix code conflicts 2016-05-20 16:38:33 +05:30
hasuniea
5c29ac8c4f fix code conflicts 2016-05-20 16:29:24 +05:30
hasuniea
a7665033b4 refactored events 2016-05-20 16:18:24 +05:30
sumedharubasinghe
344232fc32 Merge pull request #275 from rasika90/master
Showing error when device name is less than 4 letters
2016-05-19 16:06:58 +05:30
Rasika Perera
6696603ec5 Showing error when device name is less than 4 letters 2016-05-19 15:55:05 +05:30
Milan Perera
63c16bfce9 Merge pull request #272 from rasika90/master
Fixing incorrect deviceIdentifier
2016-05-19 11:33:03 +05:30
Rasika Perera
a46863b4ad Fixing incorrect deviceIdentifier 2016-05-19 11:22:42 +05:30
sumedharubasinghe
cdd7de0194 Merge pull request #271 from Shabirmean/master
Fixes to small bugs in the virtual firealarm
2016-05-19 01:36:27 +05:30
Shabirmean
e656f383fe Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-19 01:35:01 +05:30
Shabirmean
10c49cfb4c Fixes to small bugs in the virtual firealarm 2016-05-19 01:34:49 +05:30
Milan Perera
3c5aaaef61 Merge pull request #270 from milanperera/apim
Implemented API publishing to Synapse Gateway
2016-05-19 01:17:59 +05:30
mharindu
6da020e5d5 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-19 00:42:44 +05:30
sumedharubasinghe
b8b0eda0bb Merge pull request #269 from ayyoob/transport
fixed exponential backup logic
2016-05-19 00:40:07 +05:30
mharindu
cbb1f44138 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into apim 2016-05-19 00:33:31 +05:30
ayyoob
d7b423d694 fixed exponential backup logic 2016-05-19 00:28:08 +05:30
prabathabey
f563f95c41 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-19 00:22:18 +05:30
prabathabey
5b0748489d Improving virtual fire alarm plugin to use newly introduced push notification framework 2016-05-19 00:22:01 +05:30
sumedharubasinghe
fe89e8cac7 Merge pull request #268 from ayyoob/transport
fixed exponential backup logic
2016-05-18 23:18:11 +05:30
mharindu
0fee083c4b Added a null check to virtualfire-alarm 2016-05-18 22:03:16 +05:30
ayyoob
4001dbf887 fixed exponential backup logic 2016-05-18 19:32:39 +05:30