Commit Graph

2675 Commits

Author SHA1 Message Date
sinthuja
3bf2f21711 Adding back the device-analytics-config.xml, and modifying log4j configs. 2016-11-09 14:19:17 +05:30
sinthuja
227779c2ad adding broker distribution and some logging configuration changes. 2016-11-09 12:44:21 +05:30
sinthuja
3b8fe71f02 Merge pull request #200 from GPrathap/iot-product-restructure
init commit: adding wso2 mb as wso2iot- broker
2016-11-09 09:52:48 +05:30
GPrathap
0ce49684fc init commit: adding wso2 mb as wso2iot- broker 2016-11-09 09:45:35 +05:30
ayyoob
8de788097a Merge branch 'IoTS-1.0.0' of https://github.com/wso2/product-iots into IoTS-1.0.0 2016-11-08 23:43:26 +05:30
ayyoob
21bf103e6e added android feature 2016-11-08 23:41:27 +05:30
sinthuja
da7929c5a3 some more fixes to the startup script. 2016-11-08 20:57:12 +05:30
sinthuja
37b2cb01ff Adding bin scripts. 2016-11-08 20:38:27 +05:30
Chatura Dilan
878c38ad8e Merge pull request #199 from GPrathap/IoTS-1.0.0
removing mb mqtt authorization extension.
2016-11-08 17:48:51 +05:30
GPrathap
401ad2846c removing mb mqtt authorization extension. This has been moved to https://github.com/wso2/carbon-device-mgt-plugins/pull/403 2016-11-08 16:19:45 +05:30
sinthuja
e0b29d4f08 Moving geo dashboard related files to src/repo/resources. 2016-11-08 13:04:40 +05:30
sinthuja
5fb6db5c7a Renaming the analytics modules to follow the naming structure. 2016-11-08 12:55:40 +05:30
sinthuja
9704c0b51f Adding empty distribution module. 2016-11-08 12:50:07 +05:30
sinthuja
21ab784b44 removing the distro 2016-11-08 12:48:23 +05:30
sinthuja
f551b4447a Removing the distribution dir. 2016-11-08 12:39:12 +05:30
sinthuja
81030f5d22 Removing old modules, and creating empty skeleton for broker and distro. 2016-11-08 12:33:24 +05:30
sinthuja
0e959da763 First cut of iot-pack restructuring. 2016-11-08 12:27:59 +05:30
Ruwan
1139b7f31c Merge pull request #198 from ayyoob/IoTS-1.0.0
disabled mobile feature installation
2016-11-07 06:04:37 +05:30
ayyoob
4a4412b927 disabled mobile feature installation 2016-11-07 00:52:06 +05:30
Ayyoob Hamza
42fc5b1f4b Merge pull request #197 from ruwany/merge-prod
removing common/base modules & refactoring
2016-11-04 20:20:48 +05:30
Ace
2e15f2767d merging with upstream 2016-11-04 20:09:28 +05:30
Ace
c9c717af1c removing common/base modules & refactoring 2016-11-04 18:57:19 +05:30
sinthuja
8f7529a106 Merge pull request #196 from GPrathap/IoTS-1.0.0
removing MB related features
2016-11-02 15:54:15 +05:30
GPrathap
ffa6a9cf59 removing mb features and related configurations 2016-11-02 15:43:53 +05:30
GPrathap
56ec6b1e96 removing cdmf devicetype archetype. This has been moved to https://github.com/wso2/carbon-device-mgt-maven-plugin 2016-11-02 15:42:37 +05:30
charitha
7562734282 Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0 2016-11-02 13:45:56 +05:30
sinthuja
b86694cc93 Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0-fresh 2016-11-02 13:16:36 +05:30
sinthuja
c992e68ec7 Revert: removing MB references from IOTserver pack (1fe9a80102) 2016-11-02 13:15:34 +05:30
sinthuja
52a584caa2 changing carbon analytics common version to 5.1.4. 2016-11-02 13:10:57 +05:30
charitha
be5d946794 Merge remote-tracking branch 'upstream/IoTS-1.0.0' into IoTS-1.0.0
# Conflicts:
#	modules/distribution/src/samples-deployer.xml
2016-11-02 13:08:04 +05:30
sinthuja
4ff880f57f Merge pull request #192 from hastef88/removeMBReferences
removing MB references from IOTserver pack
2016-11-02 13:06:29 +05:30
sinthuja
7424caa74f Merge branch 'removeMBReferences' of https://github.com/hastef88/product-iots into IoTS-1.0.0-fresh 2016-11-02 12:56:27 +05:30
Susinda Perera
8a59ae4f68 Merge pull request #195 from susinda/master
Adding certMgt to dbscripts folder
2016-11-02 12:46:30 +05:30
susinda
1ade00fa64 Reverting 'Merge pull request #185' as this need to be done in iots-1.0.0 branch 2016-11-02 12:42:22 +05:30
Susinda Perera
7b6061b51b Merge pull request #185 from susinda/master
Adding certMgt to dbscripts folder
2016-11-02 12:13:59 +05:30
sinthuja
6454c5b0df Removing DAS 2016-11-02 11:09:14 +05:30
sinthuja
60bfc15344 Revert: Removing DAS components. 2016-11-02 10:57:24 +05:30
ayyoob
59207f9980 merged with origin IoTS-1.0.0 2016-11-02 09:44:30 +05:30
sinthuja
c9a652e04b Adding DAS remote location with port offset 1. 2016-11-01 20:01:06 +05:30
sinthuja
62bad0fb2a Removing DAS components from IoT distribution. 2016-11-01 18:41:14 +05:30
Charitha Goonetilleke
310a87962b Merge pull request #193 from charithag/IoTS-1.0.0
Synced with master
2016-11-01 15:51:10 +05:30
kamidu
89b8a45e2e adding new released version of carbon-kernal, device-mgt and device-mgt-plugins 2016-11-01 14:43:18 +05:30
Hasitha Amal De Silva
1fe9a80102 removing MB references from IOTserver pack 2016-11-01 00:31:16 -04:00
sinthuja
3156fd01ea Adding the analytics-scripts and themes template. 2016-10-26 17:00:50 +05:30
sinthuja
87109d5b87 Adding analytics files. 2016-10-26 15:10:49 +05:30
susinda
d580789e41 Merge remote-tracking branch 'upstream/master' 2016-10-25 12:32:24 +05:30
ayyoob
647262b652 added filter properties and escape string for resource plugin 2016-10-24 02:18:19 +05:30
ayyoob
b559f0cf3a removed tmp files 2016-10-23 20:45:30 +05:30
ayyoob
7844cba270 moved samples to src to support filter properties 2016-10-23 20:35:50 +05:30
ayyoob
a4b8e81a56 removed plugin and added the deployer file for connected cup 2016-10-23 20:28:15 +05:30