Commit Graph

216 Commits

Author SHA1 Message Date
ayyoob
599ad73a72 added a configuration ui to connected cup 2016-06-17 17:22:04 +05:30
Ruwan
d712d07c80 Merge pull request #164 from sahan-kariyawasam/master
Embedded gadget dashboard page in connectedcup analytics page
2016-06-09 13:30:47 +05:30
Ruwan
94cafd0346 Merge pull request #163 from sidias/master
Error Handling
2016-06-09 13:30:40 +05:30
Sahan Kariyawasam
b6cc3147fe Embedded gadget dashboard page in connectedcup analytics page 2016-06-09 13:12:33 +05:30
buddhi nipun mihara
5df1d474ea Update type-view.hbs 2016-06-09 13:07:11 +05:30
buddhi nipun mihara
7407298ca4 Update PushSystemUsage.java 2016-06-09 13:03:48 +05:30
buddhi nipun mihara
52712e1b2e Update JavaApp.java 2016-06-09 13:00:27 +05:30
Ruwan
580421048d Merge pull request #159 from sidias/master
Mac OS X script update
2016-06-09 06:01:44 +05:30
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