Commit Graph

1894 Commits

Author SHA1 Message Date
Ruwan
3382e2c144 Merge pull request #224 from rasika/master
Updating APIKeyValidator/ServerURL to pick current IP instead of "localhost"
2016-12-16 12:50:20 +05:30
Rasika Perera
485015b479 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-16 12:43:15 +05:30
Rasika Perera
c2806678e6 Updating APIKeyValidator/ServerURL to pick current IP instead of "localhost" 2016-12-16 12:42:47 +05:30
Hasunie
b0d1c73888 Merge pull request #223 from harshanL/master
Added OWASP configurations to IoT pack.
2016-12-16 11:02:23 +05:30
Harshan Liyanage
5de373b6c2 Added OWASP configurations to IoT pack. 2016-12-16 10:56:50 +05:30
Madawa Soysa
ac5c4b0d3c Removing UI components from MB
This commit removes the ui components of the message broker module in order to bring the module in to a headless state.
2016-12-15 17:21:21 +05:30
Menaka Jayawardena
75c6eba589 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-14 16:39:31 +05:30
Hasunie
e35560f703 Merge pull request #221 from harshanL/master
Added Owasp config for store and publisher apps
2016-12-14 11:26:24 +05:30
Harshan Liyanage
4ef3e703da Added Owasp config for store and publisher apps 2016-12-14 11:22:25 +05:30
Menaka Jayawardena
5431fced9c Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-14 10:20:32 +05:30
Rasika Perera
a3e53770f2 Merge pull request #220 from rasika/master
Changing SSO login page into /devicemgt/login
2016-12-11 15:02:41 +05:30
Rasika Perera
fc821e1cab Changing SSO login page into /devicemgt/login 2016-12-09 19:02:19 +05:30
charitha
ec2a28d097 Bump versions to next development iteration 2016-12-09 13:12:41 +05:30
Charitha Goonetilleke
a27fe2d866 Merge pull request #219 from wso2/release-1.0.0-alpha5
Release 1.0.0 alpha5
2016-12-09 12:59:09 +05:30
WSO2 Builder
412f912ca3 [maven-release-plugin] prepare for next development iteration 2016-12-09 06:30:04 +00:00
WSO2 Builder
80bfd669d2 [maven-release-plugin] prepare release v1.0.0-ALPHA5 2016-12-09 06:27:54 +00:00
charitha
0e13ffc991 Bump versions to released component versions 2016-12-09 01:32:56 +05:30
Charitha Goonetilleke
40d7ebce0b Merge pull request #217 from madhawap/master
Adding separate tasks to carry out device monitoring for each device type
2016-12-08 18:03:39 +05:30
Charitha Goonetilleke
079788c3e8 Merge pull request #218 from dunithd/master
Upgrading analytics carbon.kernel.version to 4.4.10
2016-12-08 17:52:49 +05:30
madhawap
62f46a2cf8 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:52:46 +05:30
dunithd
042da62607 Upgrading analytics carbon.kernel.version to 4.4.10 2016-12-08 17:50:00 +05:30
madhawap
dfbecaa8c2 Adding separate tasks to carry out device monitoring for each device type 2016-12-08 17:43:53 +05:30
Menaka Jayawardena
1d7021d06a Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-08 16:43:50 +05:30
Rasika Perera
e7f6c0797f Revert back changes done to sso 2016-12-08 14:59:42 +05:30
Harshan Liyanage
ebe4fff932 Merge pull request #215 from rasika/master
Replacing application-authentication.xml from IoT
2016-12-07 15:19:59 +05:30
Rasika Perera
b7bc800cec Replacing application-authentication.xml from IoT 2016-12-07 14:53:28 +05:30
Rasika Perera
7b2c0a71f8 Replacing application-authentication.xml from IoT 2016-12-07 14:52:14 +05:30
Menaka Jayawardena
9045b50fa8 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-07 13:20:39 +05:30
Menaka Jayawardena
934b4706d4 Modified designer.json to share query parameters in portal. 2016-12-07 13:16:49 +05:30
sinthuja
c4bb4fc544 Merge branch 'android-sense-feature' 2016-12-07 11:08:46 +05:30
sinthuja
1461915347 Merge pull request #214 from Megala21/embed
Making the local copies of designer.json to be compatible with carbon-dashboards designer.json
2016-12-07 10:25:01 +05:30
Megala
20da28f48b Making the local copies of designer.json to be compatible with carbon-dashboards designer.json 2016-12-07 09:57:30 +05:30
charitha
a52f02850f Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-06 18:01:32 +05:30
sinthuja
75a1fb6ede Merge pull request #213 from Megala21/embed
Adding siddhi extension feature for geo dashboard
2016-12-06 17:46:24 +05:30
Megala
aeaee5222f Adding siddhi extension feature for geo dashboard 2016-12-06 17:19:25 +05:30
Chatura Dilan
79325ac52a Creating APPM datasources 2016-12-06 15:16:37 +05:30
charitha
f0bc7854cc Merge branch 'master' of https://github.com/wso2/product-iot-server 2016-12-06 15:09:25 +05:30
charitha
b255782834 Add certificate mgt apis 2016-12-06 15:09:11 +05:30
Chatura Dilan
cd26a8daec Merge branch 'master' of github.com:wso2/product-iots 2016-12-06 13:50:38 +05:30
Chatura Dilan
9874844082 Added config to remove webapps 2016-12-06 13:48:08 +05:30
Ruwan
4d606005f7 Merge pull request #211 from rasika/master
Adding /devicemgt/login as authentication url when sso enabled
2016-12-06 12:31:52 +05:30
Rasika Perera
3e3bf1ce38 Fixing application-authentication.xml not replaced 2016-12-06 12:18:30 +05:30
Rasika Perera
945c581d99 Copying application-authentication.xml into pack 2016-12-06 11:59:23 +05:30
Rasika Perera
cdbcfd5355 Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-06 11:36:35 +05:30
Rasika Perera
ae96430e0d Adding /devicemgt/login as authentication url when sso enabled 2016-12-06 10:59:45 +05:30
Ruwan
fd1d37b9f2 Merge pull request #210 from harshanL/master
Updated carbon component versions to include security fixes
2016-12-06 10:41:03 +05:30
Harshan Liyanage
694a7087b0 Updated carbon component versions to include security fixes 2016-12-06 10:37:55 +05:30
Ruwan
58e944f90e Merge pull request #209 from rasika/master
Adding missing certificate management web apps features and APNS and GCM providers commented on cdm-config
2016-12-06 10:37:00 +05:30
Rasika Perera
17f01a137e Merge branch 'master' of https://github.com/wso2/product-iots 2016-12-06 10:33:25 +05:30
Rasika Perera
96d0d048df Adding APNS and GCM commented on cdm-config 2016-12-06 10:25:40 +05:30