community/product-iots
1
0
Fork 0
mirror of https://repository.entgra.net/community/product-iots.git synced 2025-09-16 23:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
909 Commits 10 Branches 83 Tags 214 MiB
fe5c6926df
Commit Graph

909 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rasika Perera
29aca290a4 Adding group permission checking 2016-05-04 00:49:06 +05:30
Ruwan
5170879d4c Merge pull request #126 from ayyoob/das-ext 
Fixed https://wso2.org/jira/browse/IOTS-64 and temporaly disabled unused samples
 2016-05-03 18:46:13 +05:30
ayyoob
751b2f8dae removed unused sample device types 2016-05-03 18:40:31 +05:30
ayyoob
586aaa5f1e Fixed https://wso2.org/jira/browse/IOTS-64 2016-05-03 18:40:15 +05:30
Milan Perera
5b49493a8f Merge pull request #125 from ayyoob/das-ext 
resolved issues in connected cup sample
 2016-05-03 13:57:22 +05:30
ayyoob
ad237ffd34 resolved issues in connected cup sample 2016-05-03 13:44:08 +05:30
Ruwan
67c5b493af Merge pull request #124 from ayyoob/das-ext 
updated IDP config
 2016-04-29 17:56:07 +05:30
ayyoob
720a57f5df updated IDP config 2016-04-29 17:41:05 +05:30
Ruwan
233084a990 Merge pull request #123 from Shabirmean/master 
Removed custom keystores and included only the 'wso2certs.jks' file with CA and RA certs for SCEP
 2016-04-29 16:47:46 +05:30
Shabirmean
5527e82bab Removed custom keystores and included only the 'wso2certs.jks' file with CA and RA certs for SCEP 2016-04-29 16:42:25 +05:30
Ruwan
94c6f5c3d4 Merge pull request #122 from ayyoob/das-ext 
resolve server shutdown issues
 2016-04-24 05:21:48 +05:30
ayyoob
2a6e42b646 resolve server shutdown issues 2016-04-24 02:16:27 +05:30
Ruwan
7b4db0bc39 Merge pull request #121 from NuwanSameera/master 
Move digital display and drone analyzer to samples.
 2016-04-23 21:37:18 +05:30
NuwanSameera
2f2c23105a Move digital display and drone analyzer to samples. 2016-04-22 15:58:12 +05:30
Ruwan
8b10e550ef Merge pull request #120 from ayyoob/das-ext 
Few fixes after testing
 2016-04-20 10:17:42 +05:30
ayyoob
568bb7d09f Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-04-20 00:00:48 +05:30
ayyoob
b336c05625 few fixes after testing 2016-04-19 23:35:43 +05:30
Ruwan
062f922f32 Merge pull request #119 from NuwanSameera/master 
Remove monitor operations from controoler api from samples.
 2016-04-19 18:35:36 +05:30
NuwanSameera
4f28e803af Remove monitor operations from controoler api. 2016-04-19 17:21:09 +05:30
Prabath Abeysekara
2fadbc10a6 Merge pull request #116 from charithag/master 
Add devicemgt_admin jax-rs and removed mdm-admin jax-rs
 2016-04-19 13:36:58 +05:30
Prabath Abeysekara
a6e2b235c9 Merge pull request #117 from ayyoob/das-ext 
Added DAS extensions features and upgraded analytics versions
 2016-04-18 17:32:31 +05:30
ayyoob
394f57d729 Added DAS Extensions features 2016-04-18 17:17:14 +05:30
charithag
4d76f89b87 Merge branch 'master' of https://github.com/wso2/product-iots 2016-04-18 17:10:49 +05:30
charithag
863b616b0b Disabling tests temporally until setting the port offset for automation. 2016-04-18 17:08:06 +05:30
charithag
276eca2c63 Enabled UI testing again 2016-04-18 16:43:40 +05:30
charithag
49466b2953 Add devicemgt_admin jax-rs and removed mdm-admin jax-rs 2016-04-18 16:42:53 +05:30
Ruwan
d8351aaa1e Merge pull request #115 from NuwanSameera/master 
Add Uninstall feature to sample device types.
 2016-04-18 11:58:14 +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
ayyoob
e9f2062362 added files related to activate synapse as a gateway 2016-04-18 02:58:55 +05:30
ayyoob
f2648c2c28 few changes after testing with the apim 2016-04-17 12:21:17 +05:30
ayyoob
a80a493506 few changes after testing 2016-04-15 23:11:11 +05:30
ayyoob
d9361e073e Merge branch 'master' of https://github.com/wso2/product-iots into das-ext 2016-04-14 20:05:07 +05:30
ayyoob
f91b566425 version update and added das extension feature 2016-04-14 19:57:13 +05:30
Ruwan
f80523f409 Merge pull request #114 from charithag/master 
Fix build status link and icon with content update
 2016-04-04 19:05:46 +05:30
charithag
7ba03e6cc6 Fix build status link and icon with content update 2016-04-04 09:35:04 +05:30
Ruwan
783465d459 Merge pull request #113 from ayyoob/master 
removed snapshot version from dependencies
 2016-04-01 21:34:39 +05:30
ayyoob
4d2c63eff7 disabled jwt grant type 2016-04-01 21:13:56 +05:30
ayyoob
7e51653b36 removed snapshot version from dependencies 2016-04-01 21:03:48 +05:30
Ruwan
94ba3ff6c2 Merge pull request #112 from rasika90/master 
Removing uuf template app feature from iots
 2016-04-01 19:29:31 +05:30
Rasika Perera
0fc75151f6 Removing uuf template app feature 2016-04-01 15:08:34 +05:30
Prabath Abeysekara
bdb3bb3023 Merge pull request #110 from charithag/master 
Disabled IoT device types based features temporally.
 2016-04-01 12:57:50 +05:30
charithag
85a00afe85 Merge branch 'master' of https://github.com/wso2/product-iot-server 
# Conflicts:
#	modules/distribution/src/assembly/bin.xml
#	modules/features/org.wso2.iot.styles.feature/pom.xml
#	modules/features/pom.xml
#	modules/p2-profile-gen/pom.xml
 2016-03-31 23:41:07 +05:30
Prabath Abeysekara
e679648ffb Merge pull request #111 from ayyoob/merge-latest 
Changed analytics to released version and temporally disabled mobile …
 2016-03-31 16:40:01 +05:30
ayyoob
5b81f8a6a3 upgraded analytics version to snapshot to resolve spark errors 2016-03-31 15:13:47 +05:30
ayyoob
0b6cd88b78 Changed analytics to released version and temporally disabled mobile features until impl is released from base feature. 2016-03-31 05:58:09 +05:30
charithag
4cfa5f60ea Disabled IoT device types based features temporally. 2016-03-30 02:07:35 +05:30
Charitha Goonetilleke
8f60317a4f Add build status 2016-03-29 12:20:38 +05:30
charithag
17e9dd9127 Fix for https://wso2.org/jira/browse/IOTS-99 2016-03-25 15:29:40 +05:30
Ruwan
155867b334 Merge pull request #109 from ayyoob/master 
Added JWT grant type and upgraded the APIM version
 2016-03-24 08:45:03 +05:30