Ruwan
|
14a6cf46b3
|
Merge pull request #160 from ayyoob/das-ext
Added profiles
|
2016-06-08 23:00:14 +05:30 |
|
buddhinipun
|
a45bbf67b5
|
add fix for bashrunner
|
2016-06-08 18:40:01 +05:30 |
|
buddhinipun
|
9d0af60be7
|
bug fix for summary table name
|
2016-06-08 18:17:10 +05:30 |
|
buddhinipun
|
c68df4d3a2
|
adding ui changes
|
2016-06-08 18:06:06 +05:30 |
|
buddhinipun
|
c092542b8e
|
changes to mac device
|
2016-06-08 17:46:19 +05:30 |
|
buddhinipun
|
e02f9bf4a5
|
adding macosx device agent implementation
|
2016-06-08 16:43:56 +05:30 |
|
buddhinipun
|
c1f3a670b5
|
resolving pom issues
|
2016-06-08 12:21:32 +05:30 |
|
buddhinipun
|
e22089ef59
|
adding connectedlap device sample
|
2016-06-07 20:14:52 +05:30 |
|
ayyoob
|
af5d6250fc
|
merge with upstream
|
2016-06-07 14:34:32 +05:30 |
|
GPrathap
|
4003af39e8
|
removing obsolete code
|
2016-06-06 21:28:51 +05:30 |
|
GPrathap
|
ab201d0aa4
|
changed year in license header
|
2016-06-06 21:27:41 +05:30 |
|
GPrathap
|
fda1d4ddf7
|
adding plugin implementation
|
2016-06-06 21:19:50 +05:30 |
|
GPrathap
|
fdedb70f80
|
adding analytics scripts
|
2016-06-06 21:18:00 +05:30 |
|
GPrathap
|
25844c8c60
|
adding new device type: drone analyzer
|
2016-06-06 06:31:04 +05:30 |
|
GPrathap
|
5da3c09a18
|
removing droneanalyzer old sample
|
2016-06-06 06:00:19 +05:30 |
|
charitha
|
5a463e4194
|
Fix bugs in generated firealarm plugin
|
2016-06-02 10:25:43 +05:30 |
|
charitha
|
80ff8613b2
|
Update firealarm to comply with latest modifications
|
2016-06-01 15:07:39 +05:30 |
|
mharindu
|
073b9da935
|
Upgraded versions
|
2016-05-20 18:07:59 +05:30 |
|
ayyoob
|
57fd20291b
|
resolving coffeecup issues
|
2016-05-19 03:50:30 +05:30 |
|
ayyoob
|
99c693bcae
|
few fixes after testing
|
2016-05-18 19:34:07 +05:30 |
|
Ruwan
|
b7040ca5c2
|
Merge pull request #118 from charithag/master
Update analytics and configs in connectedcup
|
2016-05-16 16:24:52 +05:30 |
|
charitha
|
c320148a10
|
Update analytics and configs in connectedcup
|
2016-05-16 16:18:19 +05:30 |
|
ayyoob
|
a92eb8bd34
|
refactored connected cup apis
|
2016-05-15 17:46:30 +05:30 |
|
ayyoob
|
d2f223da90
|
few fixes after testing the device type with the refactoring
|
2016-05-14 20:43:27 +05:30 |
|
ayyoob
|
d19da2357b
|
added missing license headers
|
2016-05-14 11:29:17 +05:30 |
|
ayyoob
|
0b893ad64c
|
refactored connected cup analytics scripts
|
2016-05-14 11:11:50 +05:30 |
|
ayyoob
|
d0183deb2a
|
few changes in event recievers and remove type and method from feature
|
2016-05-13 02:54:21 +05:30 |
|
ayyoob
|
14ead035d7
|
few changed mqtt authoriser
|
2016-05-12 13:39:44 +05:30 |
|
Rasika Perera
|
29aca290a4
|
Adding group permission checking
|
2016-05-04 00:49:06 +05:30 |
|
ayyoob
|
ad237ffd34
|
resolved issues in connected cup sample
|
2016-05-03 13:44:08 +05:30 |
|
NuwanSameera
|
2f2c23105a
|
Move digital display and drone analyzer to samples.
|
2016-04-22 15:58:12 +05:30 |
|
NuwanSameera
|
4f28e803af
|
Remove monitor operations from controoler api.
|
2016-04-19 17:21:09 +05:30 |
|
NuwanSameera
|
ab7ee2dbb8
|
Merge remote-tracking branch 'origin/master'
Conflicts:
modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/transport/ConnectedCupMQTTConnector.java
modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/ConnectedCupServiceUtils.java
modules/samples/connectedcup/component/controller/src/main/java/org/coffeeking/controller/service/ConnectedCupControllerService.java
modules/samples/connectedcup/component/manager/src/main/java/org/coffeeking/manager/service/ConnectedCupManagerService.java
modules/samples/connectedcup/component/manager/src/main/webapp/WEB-INF/cxf-servlet.xml
modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java
modules/samples/currentsensor/component/controller/src/main/java/org/homeautomation/currentsensor/manager/api/CurrentSensorControllerService.java
modules/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/CurrentSensorManagerService.java
modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java
modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java
modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java
modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java
modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDeviceDAOImpl.java
modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java
modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java
modules/samples/firealarm/component/controller/src/main/java/org.homeautomation/firealarm/controller/api/ControllerService.java
|
2016-04-18 11:49:18 +05:30 |
|
NuwanSameera
|
c7c2222e4b
|
Add Uninstall feature to sample device types.
|
2016-04-18 11:47:47 +05:30 |
|
charithag
|
17e9dd9127
|
Fix for https://wso2.org/jira/browse/IOTS-99
|
2016-03-25 15:29:40 +05:30 |
|
Charitha Goonetilleke
|
9afcfc6ee6
|
Merge pull request #107 from charithag/master
Refactoring
|
2016-03-18 12:49:52 +05:30 |
|
charithag
|
e5c11b9fa5
|
Refactoring
|
2016-03-18 12:47:14 +05:30 |
|
NuwanSameera
|
e0b9524168
|
Remove policy based jaggery apps from samples.
|
2016-03-17 15:00:43 +05:30 |
|
NuwanSameera
|
77b4a51add
|
Resolve conflicts.
|
2016-03-17 14:57:25 +05:30 |
|
NuwanSameera
|
0ab149d392
|
Remove policy based jagerry apps from samples.
|
2016-03-17 14:44:20 +05:30 |
|
charithag
|
16a8e63497
|
Merge branch 'master' of https://github.com/charithag/product-iot-server
# Conflicts:
# modules/samples/doormanager/component/pom.xml
|
2016-03-15 13:58:16 +05:30 |
|
charithag
|
a2c016efcc
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-15 11:53:14 +05:30 |
|
charithag
|
dc3540f2ef
|
Merge branch 'master' of https://github.com/charithag/product-iot-server
# Conflicts:
# modules/samples/doormanager/component/pom.xml
|
2016-03-15 11:52:59 +05:30 |
|
GPrathap
|
d9fd45e5ab
|
removed file separator when creating mqtt subscriber topic
|
2016-03-15 11:49:28 +05:30 |
|
NuwanSameera
|
1ac7f55435
|
Add permissions.xml to current sensor device type.
|
2016-03-15 10:50:03 +05:30 |
|
Charitha Goonetilleke
|
6029428336
|
Bump json version
|
2016-03-14 23:58:07 +05:30 |
|
Charitha Goonetilleke
|
f48b35b494
|
Bump json version
|
2016-03-14 23:38:14 +05:30 |
|
Charitha Goonetilleke
|
a7221a04b6
|
Bump json version
|
2016-03-14 23:37:30 +05:30 |
|
Charitha Goonetilleke
|
fbe6ebe9df
|
Fix json library version
|
2016-03-14 23:36:14 +05:30 |
|
Menaka Madushanka
|
f7cf6fe56e
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-14 17:59:10 +05:30 |
|
NuwanSameera
|
aeb3ef20ac
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-14 10:14:02 +05:30 |
|
GPrathap
|
24fe930727
|
refactoring code
|
2016-03-13 22:02:09 +05:30 |
|
GPrathap
|
9b38eddd09
|
relocated ui component
|
2016-03-13 22:01:28 +05:30 |
|
GPrathap
|
87c4bbff85
|
removing and adding relevant images
|
2016-03-13 21:59:15 +05:30 |
|
GPrathap
|
39af0a9f57
|
removing and adding required images
|
2016-03-13 21:57:37 +05:30 |
|
GPrathap
|
5deac3cca1
|
adding claims definitions
|
2016-03-13 21:56:01 +05:30 |
|
GPrathap
|
3416a191c0
|
adding agent source code
|
2016-03-13 21:54:13 +05:30 |
|
GPrathap
|
5dd57a157e
|
changing source code according to new API changes
|
2016-03-13 21:51:16 +05:30 |
|
GPrathap
|
e2ce28767e
|
added analytics scripts
|
2016-03-13 21:45:29 +05:30 |
|
GPrathap
|
fa112b28e5
|
removed unnecessary module: agent
|
2016-03-13 21:41:57 +05:30 |
|
NuwanSameera
|
ee250d25c5
|
Add permissions.xml to connected-cup device type.
|
2016-03-11 19:16:09 +05:30 |
|
charithag
|
706002b4d5
|
Fix for https://wso2.org/jira/browse/IOTS-77
|
2016-03-10 19:25:50 +05:30 |
|
Menaka Madushanka
|
b930301819
|
Merge remote-tracking branch 'origin/master'
|
2016-03-10 15:06:04 +05:30 |
|
ayyoob
|
2a03111a5a
|
merged with upstream
|
2016-03-08 16:08:16 +05:30 |
|
ayyoob
|
dd3bfd4ffb
|
merged with upstream
|
2016-03-08 15:53:17 +05:30 |
|
Shabirmean
|
8206dc0f92
|
Added the doormanager-icon.png
|
2016-03-07 09:11:35 +05:30 |
|
charithag
|
6c7041dcda
|
Add ESP8266 based fire alarm sample
|
2016-03-04 10:59:33 +05:30 |
|
charithag
|
4427f53044
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-01 15:00:42 +05:30 |
|
Menaka Madushanka
|
b99001ae8d
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-02-29 18:31:37 +05:30 |
|
GPrathap
|
4c2eeb4b2a
|
Fix for JIRA IOTS-80
|
2016-02-25 23:52:21 +05:30 |
|
Menaka Madushanka
|
57f91949a3
|
Code formatting and fixes
|
2016-02-25 14:21:24 +05:30 |
|
Menaka Madushanka
|
7cf8fcf4ac
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-02-23 11:13:39 +05:30 |
|
charithag
|
c556a9a7b0
|
Geesara's changes
|
2016-02-17 16:35:47 +05:30 |
|
Ace
|
fca3016181
|
Bug fixes
|
2016-02-17 01:39:15 +05:30 |
|
Ace
|
bb1216c6bf
|
logic to send event to CEP
|
2016-02-17 01:19:03 +05:30 |
|
Ace
|
8f8209db08
|
Adding method to check if user exists
|
2016-02-17 00:31:11 +05:30 |
|
charithag
|
ae08246052
|
fix issues
|
2016-02-16 23:07:20 +05:30 |
|
charithag
|
09fbbad7d7
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-16 19:37:09 +05:30 |
|
GPrathap
|
1d698a73fd
|
added new devicetype: doormanager
|
2016-02-16 19:32:21 +05:30 |
|
charithag
|
9e9627f37f
|
upstream merge
|
2016-02-16 19:26:06 +05:30 |
|
charithag
|
81117d00c4
|
Change water dispensor category
|
2016-02-16 19:21:43 +05:30 |
|
NuwanSameera
|
cc5cf0e09e
|
Current sensor display name changed to Samrt Meeter
|
2016-02-15 13:17:21 +05:30 |
|
NuwanSameera
|
aa6d02f25c
|
Merge remote-tracking branch 'upstream/master'
|
2016-02-15 09:50:26 +05:30 |
|
NuwanSameera
|
335632769f
|
Current Sensor controller changes
|
2016-02-15 09:49:51 +05:30 |
|
Menaka Madushanka
|
cb1c30ec43
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-02-14 01:48:17 +05:30 |
|
Menaka Madushanka
|
c086968e24
|
Added comments and code cleanup
|
2016-02-12 10:23:18 +05:30 |
|
charithag
|
fc702b96b9
|
Bump carbon device mgt plugins version
|
2016-02-11 15:33:10 +05:30 |
|
NuwanSameera
|
8ca2614a08
|
Change Current Sensor display name to Water Dispensor
|
2016-02-08 17:42:40 +05:30 |
|
NuwanSameera
|
e64bed8b50
|
Add flow sensor to currentsensor device type and modify device view page
|
2016-02-08 16:07:32 +05:30 |
|
charithag
|
463fb50b8f
|
Updated current sensor component structure
|
2016-02-02 21:27:23 +05:30 |
|
NuwanSameera
|
d9624efc80
|
Add current sensor device type sample
|
2016-02-02 16:13:46 +05:30 |
|
NuwanSameera
|
aff032c66d
|
Add current sensor device type sample
|
2016-02-02 16:13:10 +05:30 |
|
charithag
|
90dcc43ed1
|
Updated connected cup component structure
|
2016-02-02 16:02:25 +05:30 |
|
Charitha Goonetilleke
|
0c2318c425
|
Merge pull request #83 from charithag/master
Update coffee cup UI
|
2016-01-27 15:14:21 +05:30 |
|
charithag
|
d0c7cddfd0
|
Update coffee cup UI
|
2016-01-27 15:13:20 +05:30 |
|
Ace
|
279c4a1c7a
|
Adding fix for startup error when MB features are not yet up
|
2016-01-27 14:25:50 +05:30 |
|
Ace
|
1aef1d10c3
|
Bug fixes
|
2016-01-27 13:08:57 +05:30 |
|
Ace
|
f9be9a8c0e
|
Improving connected cup UI
|
2016-01-27 12:09:34 +05:30 |
|
Ace
|
a3fd8d5134
|
Fixing issues with connected cup sample
|
2016-01-26 09:25:56 +05:30 |
|
Ruwan
|
347b27acf9
|
Merge pull request #78 from NuwanSameera/master
Connected cup feature pom changes requested by menaka
|
2016-01-26 08:42:49 +05:30 |
|