Commit Graph

4538 Commits

Author SHA1 Message Date
Shabirmean
b4665f36bf Fixes to the RaspberryPi DeviceTypes to generate real-tome stats and send operations 2016-05-17 00:39:26 +05:30
sumedharubasinghe
0f29473694 Merge pull request #261 from charithag/master
Add email templates
2016-05-16 21:38:18 +05:30
charitha
5e87a5f090 Fix feature name 2016-05-16 21:25:51 +05:30
charitha
3e6bde8853 Add email templates 2016-05-16 21:12:01 +05:30
Ruwan
78d5ad2d96 Merge pull request #260 from charithag/master
Fix for https://wso2.org/jira/browse/IOTS-152
2016-05-16 18:10:33 +05:30
charitha
eb57d38507 Fix for https://wso2.org/jira/browse/IOTS-152 2016-05-16 17:51:19 +05:30
Ruwan
d1850e7491 Merge pull request #259 from charithag/master
Moved api from device-mgt
2016-05-16 17:13:06 +05:30
charitha
a954de26f9 Moved api from device-mgt 2016-05-16 17:04:47 +05:30
mharindu
d7b84cf9e4 Fixed conflicts 2016-05-16 14:14:39 +05:30
mharindu
36c88aee3c Fixed conflicts 2016-05-16 12:24:14 +05:30
mharindu
24e353698f Added permission annotations to virtual fire alarm API 2016-05-16 12:12:47 +05:30
Ruwan
7f9b7c4914 Merge pull request #258 from ayyoob/transport
refactored apis and resolved xmpp issues
2016-05-15 20:07:28 +05:30
ayyoob
67831883fb refactored apis 2016-05-15 17:45:53 +05:30
Sumedha Rubasinghe
a1db2f1d08 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-15 13:20:15 +05:30
Sumedha Rubasinghe
6348ca31a3 removed unwanted text 2016-05-15 13:19:38 +05:30
sumedharubasinghe
4e8e13d423 Merge pull request #257 from charithag/master
Add support to grouping and bug fixes
2016-05-15 13:15:52 +05:30
charitha
f3d7608cdc Add support to grouping and bug fixes 2016-05-15 13:12:50 +05:30
ayyoob
b2a8b1b7c3 resolved xmpp stream conflict error 2016-05-15 12:39:34 +05:30
ayyoob
bb0b10f14c resolved xmpp issues in virtual fire alarm 2016-05-15 11:59:10 +05:30
Ruwan
f5442384d1 Merge pull request #256 from ayyoob/transport
few fixes after testing the device types with the refactoring
2016-05-14 21:01:31 +05:30
ayyoob
64cdb33d67 few fixes after testing the device types with the refactoring 2016-05-14 20:43:15 +05:30
Dilan U. Ariyaratne
fa461eecff Merge pull request #255 from GPrathap/master
fix typos
2016-05-14 18:50:37 +05:30
GPrathap
b5fd68a6b4 fix typos 2016-05-14 18:31:22 +05:30
Milan Perera
8ff9439725 Merge pull request #254 from ayyoob/transport
refactored analytics scripts
2016-05-14 11:36:49 +05:30
ayyoob
c7effff3ce resolved an error in arduino agent code 2016-05-14 11:11:30 +05:30
ayyoob
bd1c0554a8 updated android sense agent 2016-05-14 01:02:03 +05:30
ayyoob
bfbe790aa1 updated android sense topic 2016-05-14 00:43:50 +05:30
ayyoob
aa9fe6006a Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-14 00:35:54 +05:30
ayyoob
12ace9efe1 refactored analytics scripts 2016-05-14 00:35:20 +05:30
ayyoob
3974ec7753 refactored analytics scripts 2016-05-14 00:34:36 +05:30
ayyoob
3d583cd39b refactored analytic scripts 2016-05-14 00:33:27 +05:30
Milan Perera
c53bc1b825 Merge pull request #249 from Shabirmean/master
moving down 'paho-library' installation to enable it in both virtual & real mode
2016-05-13 16:29:12 +05:30
Milan Perera
c9e4dbd561 Merge pull request #253 from WarunaS/branch-android-sense
fix bugs location and accelerometer
2016-05-13 16:28:39 +05:30
Waruna Samarsinghe
1fdb6fd54c fix bugs location and accelerometer 2016-05-13 14:15:39 +05:30
ayyoob
e7ba11f709 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins into transport 2016-05-13 05:27:41 +05:30
inosh-perera
bf7975c5d4 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:59:27 +05:30
dilanua
bc1dfb86f2 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:56:34 +05:30
dilanua
2dabfa02fa Adding swagger annotations 2016-05-13 02:56:15 +05:30
ayyoob
da24c3fc1b removed method and type from feature 2016-05-13 02:53:30 +05:30
inosh-perera
0787aa2ac1 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-13 02:51:54 +05:30
inosh-perera
afc7be590e adding swagger annotations for Android APIs 2016-05-13 02:50:17 +05:30
inoshperera
64178fe377 Merge pull request #252 from madhawap/master
Added swagger annotations to beans
2016-05-13 02:48:29 +05:30
Madhawa Perera
f25cb51679 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins
Adding swagger annotations to beans
2016-05-13 02:43:43 +05:30
Madhawa Perera
0d8010c25a Adding swagger annotations to beans 2016-05-13 02:43:23 +05:30
dilanua
f66aad9e0e Adding swagger annotations 2016-05-13 02:39:30 +05:30
ayyoob
04566ec250 updated event receivers 2016-05-12 21:59:35 +05:30
Kasun Delgolla
34d4da7e66 Merge pull request #250 from charithag/master
Fixed https://wso2.org/jira/browse/IOTS-104
2016-05-12 21:49:51 +05:30
Hasunie
cb73e24036 Merge pull request #181 from hasuniea/master
Refactored code issues
2016-05-12 21:49:45 +05:30
hasuniea
3cdb490908 added swagger annotations 2016-05-12 21:41:49 +05:30
Shabirmean
2b2b659d22 Merge branch 'master' of https://github.com/wso2/carbon-device-mgt-plugins 2016-05-12 20:46:26 +05:30