Commit Graph

1076 Commits

Author SHA1 Message Date
GPrathap
a3ff9fbdc5 adding sso configuration 2016-06-05 23:36:38 +05:30
Ruwan
bbe631d3f2 Merge pull request #287 from Anushkasandaruwan/master
Merging changes related to generation of emails based on accelarometer input.
2016-06-01 22:19:19 +05:30
Anushka Sandaruwan
82e50bdc76 Delete README.md~ 2016-06-01 20:25:34 +05:30
Anushka Samaranayake
9f1d4a0e3e Alert generation 2016-06-01 20:24:54 +05:30
Anushka Samaranayake
1265a1dd34 Alert generation 2016-06-01 20:22:29 +05:30
Kasun Delgolla
a01fe5e4f9 Adding missing parameters 2016-05-28 02:14:56 +05:30
Kasun Delgolla
bd65e8b2a7 Committing missing android features 2016-05-28 01:38:03 +05:30
Hasunie
f91dc2ee60 Merge pull request #285 from hasuniea/master
add windows feature
2016-05-27 20:08:12 +05:30
hasuniea
cc8190b541 add windows feature 2016-05-27 20:03:25 +05:30
hasuniea
d7527e95f0 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-27 18:45:49 +05:30
hasuniea
d4bce21f75 windows plugin 2016-05-27 18:45:20 +05:30
prabathabey
23343eb765 Fixing the name of android agent webapp 2016-05-27 12:50:29 +05:30
prabathabey
8620eb912f Removing redundant implementations of android and windows plugins 2016-05-27 11:59:28 +05:30
prabathabey
98a8a09813 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-27 11:23:34 +05:30
prabathabey
6f7f706428 Renaming TenantConfiguration as PlatformCongfiguration 2016-05-27 11:23:19 +05:30
Milan Perera
23c404260e Merge pull request #283 from ayyoob/transport
fixed db related jiras
2016-05-26 21:23:05 +05:30
Ruwan
d7b156b8f7 Merge pull request #284 from rasika90/master
Moving CSS into separate file
2016-05-26 18:52:45 +05:30
Rasika Perera
07984e4b6e Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-26 18:34:58 +05:30
Rasika Perera
91cc0baaf5 Moved CSS into separate file 2016-05-26 18:34:07 +05:30
Rasika Perera
0862e95f4c Moved CSS into separate file 2016-05-26 18:22:32 +05:30
ayyoob
6773157576 fixed https://wso2.org/jira/browse/IOTS-177 2016-05-26 17:10:44 +05:30
ayyoob
6f6b5104d5 fixed https://wso2.org/jira/browse/IOTS-172 2016-05-26 16:23:42 +05:30
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
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