ayyoob
|
7daedd6516
|
added jwt authenticator
|
2017-02-08 13:11:03 +05:30 |
|
kamidu
|
0eb45e7c92
|
add the cloud menu to the iot pack
|
2017-02-07 20:24:23 +05:30 |
|
ayyoob
|
ef99c0f306
|
added default credential as properties
|
2017-02-06 03:48:20 +05:30 |
|
ayyoob
|
1e25f08945
|
fixed tokenValidationUrlIssue
|
2017-02-06 00:52:36 +05:30 |
|
ayyoob
|
f890415bae
|
enabled mutual ssl support and added artifact deployment related features
|
2017-02-05 17:53:37 +05:30 |
|
ayyoob
|
ecda000395
|
used jwt grant type instead of saml
|
2017-02-04 20:52:24 +05:30 |
|
ayyoob
|
b03b958979
|
changes adapter configs after testing
|
2017-02-02 03:17:40 +05:30 |
|
ayyoob
|
c61cd953b2
|
few fixes after testing sso
|
2017-02-01 00:08:51 +05:30 |
|
ayyoob
|
3610ed762d
|
enabled UseAuthenticatedUserDomainCrypto
|
2017-01-31 14:19:02 +05:30 |
|
ayyoob
|
ab70dbe38a
|
few changes after testing multi tenancy
|
2017-01-30 22:33:18 +05:30 |
|
Ayyoob Hamza
|
26197ef770
|
Merge pull request #271 from ayyoob/3.0.0
removed apim dependencies and solved sso tenant login issues.
|
2017-01-26 12:18:33 +05:30 |
|
ayyoob
|
ca53efdab0
|
fixed sso login issue in portal in multi tenant
|
2017-01-26 00:30:03 +05:30 |
|
Menaka Jayawardena
|
a6519d1e04
|
Restored data sources change.
|
2017-01-25 17:14:03 +05:30 |
|
Menaka Jayawardena
|
3f010951af
|
POM versions updated for next release.
|
2017-01-25 17:10:47 +05:30 |
|
Menaka Jayawardena
|
e8508b1dd0
|
Modifying Integration tests.
|
2017-01-25 16:26:40 +05:30 |
|
Menaka Jayawardena
|
5d41fe313b
|
Merge branch 'backend-integration'
# Conflicts:
# modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/common/MDMHttpClient.java
# modules/integration/tests-integration-old/src/test/java/org/wso2/mdm/integration/mobileDevice/MobileDeviceManagementWithNoDevices.java
# modules/integration/tests-integration/src/test/resources/automation.xml
# modules/integration/tests-integration/src/test/resources/testng.xml
|
2017-01-25 15:50:43 +05:30 |
|
ayyoob
|
2ca23cce29
|
changed configs to support custom grant type
|
2017-01-25 14:25:28 +05:30 |
|
Menaka Jayawardena
|
cacc4d4772
|
Access token generation flow fixed.
|
2017-01-25 14:18:36 +05:30 |
|
ayyoob
|
d6695a9082
|
renamed profile names
|
2017-01-25 09:24:38 +05:30 |
|
ayyoob
|
7290f64711
|
Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0
|
2017-01-24 22:23:44 +05:30 |
|
ayyoob
|
232e63aeea
|
merged with origin
|
2017-01-24 20:47:24 +05:30 |
|
ayyoob
|
1ac1355eee
|
removed cdmc dependency from core
|
2017-01-24 19:33:36 +05:30 |
|
Ayyoob Hamza
|
030938e83e
|
Revert "Re-Enabling backend integration tests."
|
2017-01-24 11:48:53 +05:30 |
|
Menaka Jayawardena
|
3bc01b0bfb
|
Pom versions updated.
|
2017-01-24 11:31:16 +05:30 |
|
Hasunie
|
c6fda7e3d1
|
Merge pull request #266 from menakaj/backend-integration
Re-Enabling backend integration tests.
|
2017-01-24 11:26:08 +05:30 |
|
WSO2 Builder
|
369fb23a25
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-24 05:51:48 +00:00 |
|
Menaka Jayawardena
|
0f18eb9d5e
|
Re-Enabling backend integration tests.
|
2017-01-24 11:21:05 +05:30 |
|
WSO2 Builder
|
f28b4f389b
|
[maven-release-plugin] prepare release v3.0.0-RC2
|
2017-01-24 05:44:17 +00:00 |
|
Rasika Perera
|
9c2fc5985e
|
[-Diot.gatway.host="localhost"] -> [-Diot.gateway.host="localhost"
|
2017-01-24 11:06:06 +05:30 |
|
Rasika Perera
|
e1e330e83e
|
Fixed profiling issue on jss service
|
2017-01-23 16:21:14 +05:30 |
|
Rasika Perera
|
375f555a2c
|
Updated LICENSE.txt
|
2017-01-23 15:17:06 +05:30 |
|
Rasika Perera
|
0ccd63936b
|
Updated OWSAP property file
|
2017-01-23 12:43:37 +05:30 |
|
ayyoob
|
df304038da
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-01-20 21:22:50 +05:30 |
|
ayyoob
|
c91171e09c
|
replaced jaggery.conf
|
2017-01-20 21:21:15 +05:30 |
|
Rasika Perera
|
56c6f6dee9
|
Updating LICENSE.txt
|
2017-01-20 19:44:28 +05:30 |
|
Rasika Perera
|
fc4eb83297
|
update INSTALL.txt and README.txt
|
2017-01-20 18:09:16 +05:30 |
|
ayyoob
|
61e28471de
|
fixed connected cup sample issues
|
2017-01-20 16:27:32 +05:30 |
|
Rasika Perera
|
1015ca40dc
|
Updating LICENSE.txt
|
2017-01-20 10:28:05 +05:30 |
|
Rasika Perera
|
9dbab2cf2b
|
Updating LICENSE.txt
|
2017-01-20 10:13:09 +05:30 |
|
Rasika Perera
|
40880a434b
|
Created LICENSE.txt for iot-analytics
|
2017-01-20 09:58:29 +05:30 |
|
Rasika Perera
|
6661a8671b
|
Updated LICENSE.txt for message-broker
|
2017-01-20 09:58:13 +05:30 |
|
Rasika Perera
|
5a2a6e73ec
|
Updated LICENSE.txt for iot-core
|
2017-01-20 09:57:53 +05:30 |
|
Rasika Perera
|
2db9f661ac
|
Updated MB user-agent params and server name
|
2017-01-20 09:08:09 +05:30 |
|
Rasika Perera
|
bf61a210f8
|
Release note updated for 3.0.0
|
2017-01-20 08:41:05 +05:30 |
|
madhawap
|
68c46d10b3
|
fixes for synapse configs
|
2017-01-20 01:03:34 +05:30 |
|
madhawap
|
190f97cd20
|
fixes for synapse configs
|
2017-01-20 00:29:16 +05:30 |
|
Rasika Perera
|
91d9a43199
|
Fixing [iot.analytics.https.port] variable not picking up
|
2017-01-19 19:48:28 +05:30 |
|
Rasika Perera
|
6c32ad2bfc
|
Merge pull request #262 from menakaj/master
Modified csrf property for devicemgt api
|
2017-01-19 19:34:12 +05:30 |
|
Rasika Perera
|
1add362b76
|
Updated distribution filter.properties
|
2017-01-19 15:20:57 +05:30 |
|
Rasika Perera
|
cba0499a80
|
Updated install.txt and readme.txt
|
2017-01-19 15:20:57 +05:30 |
|
Rasika Perera
|
c76427edc8
|
Temporary disable throttling info not found warnings on APIM
|
2017-01-19 15:20:57 +05:30 |
|
Menaka Jayawardena
|
5114d19a07
|
Modified csrf property for devicemgt api
|
2017-01-19 13:13:56 +05:30 |
|
Rasika Perera
|
48bcecf433
|
Merge pull request #260 from hasuniea/master
fixing localhost, port binding in synapse file
|
2017-01-19 01:26:46 +05:30 |
|
Rasika Perera
|
618ee3d01a
|
CSRF fixed for /devicemgt/api
|
2017-01-18 20:59:56 +05:30 |
|
Rasika Perera
|
d0e3ae5106
|
Adding DAS env variables into shell script
|
2017-01-18 20:59:56 +05:30 |
|
Hasunie
|
f51dae6782
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-01-18 19:18:06 +05:30 |
|
Hasunie
|
6d5bb848d7
|
fixing localhost,port binding in synapse file
|
2017-01-18 19:17:54 +05:30 |
|
Maninda
|
93a4a9d494
|
Added security configs to that were missing
|
2017-01-18 16:33:42 +05:30 |
|
Chatura Dilan
|
af68560826
|
Merge branch 'master' of github.com:wso2/product-iots
|
2017-01-18 15:25:18 +05:30 |
|
Chatura Dilan
|
0bf780643d
|
Added rule for installation
|
2017-01-18 15:25:03 +05:30 |
|
Rasika Perera
|
562a13962e
|
Merge pull request #258 from chaturadilan/master
security fixes
|
2017-01-18 13:51:41 +05:30 |
|
sinthuja
|
0fa879e87f
|
Merge remote-tracking branch 'origin/master'
|
2017-01-18 13:27:35 +05:30 |
|
sinthuja
|
07869a218a
|
Updating the analytics feature used in iot-core to 1.3.3-SNAPSHOT to resolve the dependancy conflict issue in JSServiceConnector.
|
2017-01-18 13:24:45 +05:30 |
|
Chatura Dilan
|
6c02e9f947
|
Added Owasp security configurations
|
2017-01-18 13:01:45 +05:30 |
|
Chatura Dilan
|
d7e67c44df
|
Merge branch 'master' of github.com:wso2/product-iots
|
2017-01-18 13:00:08 +05:30 |
|
Chatura Dilan
|
df7d612176
|
Added Owasp security configurations
|
2017-01-18 12:59:45 +05:30 |
|
Rasika Perera
|
ae92479ac7
|
Fixing connected cup issue
|
2017-01-18 12:58:20 +05:30 |
|
Maninda
|
c90bf7f9ae
|
Corrected cache filters in web.xml files
|
2017-01-18 12:43:55 +05:30 |
|
Rasika Perera
|
127575a961
|
Changed connected cup plugin version [org.coffeeking.version]
|
2017-01-18 11:57:45 +05:30 |
|
ayyoob
|
2c500c4e4f
|
added apim separation
|
2017-01-18 01:50:46 +05:30 |
|
Maninda
|
819f3c9a23
|
Made web apps to be extracted and replace the web.xml files and pack again for fixing security issues
|
2017-01-17 17:41:24 +05:30 |
|
ayyoob
|
df6d28fe0f
|
installed missing features for device backend
|
2017-01-17 15:52:03 +05:30 |
|
ayyoob
|
b1bbd5c891
|
Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0
|
2017-01-16 23:55:22 +05:30 |
|
Rasika Perera
|
b74ea7baca
|
Adding escape urls to csrf gurad
|
2017-01-16 23:36:01 +05:30 |
|
ayyoob
|
3e152d9ace
|
Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0
|
2017-01-16 22:40:24 +05:30 |
|
ayyoob
|
c7251e251a
|
renaming worker to backend
|
2017-01-16 19:42:59 +05:30 |
|
Rasika Perera
|
b267d7eda0
|
Merge pull request #257 from hasuniea/master
fixing CSRF issue in IOT server login
|
2017-01-16 18:45:17 +05:30 |
|
Hasunie
|
da44554243
|
fixing CSRF issue in IOT server login
|
2017-01-16 18:36:21 +05:30 |
|
ayyoob
|
96e7ca0900
|
Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0
|
2017-01-16 18:30:41 +05:30 |
|
Maninda
|
5ff53e84b5
|
Commented war file copy functionality
|
2017-01-16 17:03:24 +05:30 |
|
Maninda
|
6eb1bdd719
|
Merge branch 'master' of github.com:wso2/product-iots
|
2017-01-16 16:47:23 +05:30 |
|
Maninda
|
366c05961d
|
Removed jaggery.conf from copying at build time
|
2017-01-16 16:46:19 +05:30 |
|
ayyoob
|
1b8d52e5e2
|
fixed multi tenant login issue
|
2017-01-16 16:08:23 +05:30 |
|
sinthuja
|
1e7404fdfa
|
Merge remote-tracking branch 'origin/master'
|
2017-01-16 15:14:37 +05:30 |
|
sinthuja
|
6b6936591a
|
Removing the temporary files from core distribution.
|
2017-01-16 15:10:05 +05:30 |
|
Rasika Perera
|
301f795260
|
Update designer.json
|
2017-01-16 15:08:49 +05:30 |
|
Maninda
|
f709353fc5
|
Corrected the security fixed web-app replacing configuration
|
2017-01-16 11:27:06 +05:30 |
|
WSO2 Builder
|
7286c37533
|
[maven-release-plugin] prepare for next development iteration
|
2017-01-14 22:41:45 +00:00 |
|
WSO2 Builder
|
7018c87e66
|
[maven-release-plugin] prepare release v3.0.0-RC
|
2017-01-14 22:33:32 +00:00 |
|
Rasika Perera
|
ef53c43923
|
Corrected coffeecup versions issues
|
2017-01-15 03:41:48 +05:30 |
|
Rasika Perera
|
2f15288d68
|
Corrected coffeecup versions
|
2017-01-15 03:41:06 +05:30 |
|
Rasika Perera
|
2ea8aafee8
|
Adding [basedir] on dist.xml
|
2017-01-15 03:37:40 +05:30 |
|
Rasika Perera
|
c6b0dc86b4
|
Merge pull request #256 from ayyoob/3.0.0
disabled api update
|
2017-01-13 22:43:30 +05:30 |
|
ayyoob
|
9a3049d77d
|
disabled api update
|
2017-01-13 22:17:33 +05:30 |
|
Maninda
|
d983b2f843
|
q
Merge branch 'master' of github.com:wso2/product-iots
|
2017-01-13 20:53:25 +05:30 |
|
Maninda
|
12b1672208
|
Added jaggery.conf and web apps with correct security filters / filter mappings
|
2017-01-13 20:53:03 +05:30 |
|
Rasika Perera
|
b9a4795043
|
Removed bundle.info replacement on plugins-deployer
|
2017-01-13 20:11:13 +05:30 |
|
Ayyoob Hamza
|
a6ef5babd5
|
Merge pull request #255 from ayyoob/3.0.0
change default stats permission
|
2017-01-13 20:06:25 +05:30 |
|
Dunith Dhanushka
|
8d266126f8
|
Updating endpoint URLs for DCR
|
2017-01-13 19:55:22 +05:30 |
|
ayyoob
|
75643a1041
|
change default stats permission
|
2017-01-13 19:38:50 +05:30 |
|
Hasunie
|
230ab657a3
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-01-13 15:49:13 +05:30 |
|
Rasika Perera
|
d49991a7f0
|
Fixing windows-web-agent and android-web-agent not copied issue
|
2017-01-13 14:23:41 +05:30 |
|
ayyoob
|
78d689b24b
|
adding android and windows db creation by default
|
2017-01-13 12:02:33 +05:30 |
|
Hasunie
|
2a1db1ba69
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-01-13 09:12:32 +05:30 |
|
Hasunie
|
abdb962e79
|
adding windows synapse configs
|
2017-01-13 09:12:14 +05:30 |
|
ayyoob
|
b8706c0437
|
few changes in the config
|
2017-01-13 05:25:29 +05:30 |
|
ayyoob
|
854d4389d9
|
updated webapp-publisher config
|
2017-01-13 05:18:51 +05:30 |
|
ayyoob
|
8ac43f0f37
|
few changes after testing gateway
|
2017-01-13 04:48:55 +05:30 |
|
ayyoob
|
f7399060e5
|
moved the configs to gateway
|
2017-01-12 19:30:17 +05:30 |
|
ayyoob
|
4ca84a9f2d
|
Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0
|
2017-01-12 11:25:37 +05:30 |
|
ayyoob
|
03150ad70f
|
made android and windows to be available by default
|
2017-01-12 11:13:10 +05:30 |
|
ayyoob
|
648b276491
|
few changes after testing the cluster
|
2017-01-12 11:12:49 +05:30 |
|
Rasika Perera
|
38e3f90240
|
Merge pull request #250 from ayyoob/3.0.0
added missing features updated configs
|
2017-01-11 13:24:46 +05:30 |
|
Rasika Perera
|
205dd41b0a
|
Merge pull request #231 from dimuthnc/master
location-data-visualizer sample added to product-iots/modules/samples
|
2017-01-11 13:24:31 +05:30 |
|
ayyoob
|
e6ce91885d
|
added missing components for profile
|
2017-01-11 13:08:36 +05:30 |
|
charitha
|
5feb7f82f2
|
Fix issues in connectedcup device
|
2017-01-10 16:47:28 +05:30 |
|
ayyoob
|
9f366902b1
|
Merge branch 'master' of https://github.com/wso2/product-iots into 3.0.0
|
2017-01-10 03:32:41 +05:30 |
|
ayyoob
|
63200bec45
|
added missing features and configurations
|
2017-01-10 03:09:57 +05:30 |
|
Rasika Perera
|
85c5be77c3
|
Merge pull request #248 from menakaj/master
Fixing the existing UI integration tests.
|
2017-01-09 17:02:24 +05:30 |
|
Menaka Jayawardena
|
ae8aec6a4e
|
Fixing the existing UI integration tests.
|
2017-01-09 16:59:05 +05:30 |
|
Rasika Perera
|
df3a2deeea
|
Merge pull request #246 from madhawap/master
fixes to plugins-deployer.xml
|
2017-01-09 14:59:41 +05:30 |
|
madhawap
|
07e7cb4a0a
|
fixes to plugins-deployer.xml
|
2017-01-09 14:56:59 +05:30 |
|
Rasika Perera
|
bfc3882592
|
Merge pull request #245 from menakaj/master
Enabling Integration tests in parent pom
|
2017-01-09 14:45:48 +05:30 |
|
Menaka Jayawardena
|
370ed5fd98
|
Changing pom versions to match with parent.
|
2017-01-09 14:06:05 +05:30 |
|
Menaka Jayawardena
|
52290cf485
|
Disabling UI tests in build time by default.
|
2017-01-09 13:29:05 +05:30 |
|
ayyoob
|
751eef086e
|
revived connected cup sample
|
2017-01-08 22:53:23 +05:30 |
|
ayyoob
|
9c12a2c4a0
|
changed default h2 port to 9095
|
2017-01-08 21:29:28 +05:30 |
|
ayyoob
|
afde45b2f0
|
Added default values for input and output adapters
|
2017-01-08 21:29:08 +05:30 |
|
Rasika Perera
|
18d97073d1
|
Updated cdmf-plugins version into [3.0.5]
|
2017-01-07 22:06:26 +05:30 |
|
Rasika Perera
|
a6e5ab4531
|
Renamed pom.xml var [carbon.kernel.version.iotcore] into [carbon.kernel.version]
|
2017-01-07 08:23:29 +05:30 |
|
Rasika Perera
|
e04be13e52
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-01-06 20:30:53 +05:30 |
|
Rasika Perera
|
414044177d
|
Merge pull request #242 from menakaj/master
Fixed https://wso2.org/jira/browse/IOTS-360 : Modifying current UI integration tests.
|
2017-01-06 19:37:15 +05:30 |
|
Rasika Perera
|
452950c7e5
|
Merge pull request #240 from geethkokila/master
Adding the ios gateway support for the iot server
|
2017-01-06 19:35:04 +05:30 |
|
Menaka Jayawardena
|
c9ab7103d8
|
Fixed IOTS-360 : Modifying current ui integration tests.
|
2017-01-06 19:31:40 +05:30 |
|
Rasika Perera
|
cb4b5d9732
|
Merge pull request #241 from menakaj/master
Fixed https://wso2.org/jira/browse/IOTS-359
|
2017-01-06 19:27:37 +05:30 |
|
Rasika Perera
|
ba46ff6dd0
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-01-06 19:03:32 +05:30 |
|
geethkokila
|
838d1cf610
|
Adding the ios gateway support for the iot server
|
2017-01-06 17:14:00 +05:30 |
|
Milan Perera
|
df79fcd6fd
|
Merge branch 'master' of https://github.com/wso2/product-iots into latest-master
|
2017-01-06 16:51:39 +05:30 |
|
Rasika Perera
|
2e220d21ec
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-01-06 14:20:57 +05:30 |
|
Menaka Jayawardena
|
f40159eca3
|
Merge remote-tracking branch 'origin/master'
|
2017-01-06 14:19:16 +05:30 |
|
Menaka Jayawardena
|
88e696b4e9
|
Adding custom Test Automation Extensions to start up the servers.
|
2017-01-06 14:18:58 +05:30 |
|
Menaka Jayawardena
|
284c221056
|
Changed the integration pom version to 3.0.1-SNAPSHOT.
|
2017-01-06 14:16:36 +05:30 |
|
Ace
|
7cfa3970ed
|
Adding auto_server_port
|
2017-01-06 13:34:36 +05:30 |
|
Milan Perera
|
11b0db7bed
|
Fixed version conflics
|
2017-01-06 13:17:25 +05:30 |
|
ayyoob
|
754fbe7dd3
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-01-05 22:27:32 +05:30 |
|
ayyoob
|
8888383e81
|
added deployer features
|
2017-01-05 22:27:27 +05:30 |
|
GPrathap
|
d8fdd18dde
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-01-05 14:39:46 +05:30 |
|
GPrathap
|
acb4593b9a
|
fixed: https://wso2.org/jira/browse/IOTS-344
|
2017-01-05 14:19:46 +05:30 |
|
Rasika Perera
|
c51d630bfd
|
Merge pull request #234 from ruwany/jira-fix
Making h2 db shareable between das and iot core
|
2017-01-05 12:42:21 +05:30 |
|
GPrathap
|
2e13e834c5
|
fixed: IOTS-204
|
2017-01-05 12:36:31 +05:30 |
|
Milan Perera
|
1f172a65ee
|
Merge branch 'master' of https://github.com/ruwany/product-iots into latest-master
|
2017-01-05 10:05:33 +05:30 |
|
Milan Perera
|
45207898c0
|
Configured APIMs PasswordGrantHandler in identity.xml
|
2017-01-05 10:05:27 +05:30 |
|
Rasika Perera
|
56a976a84a
|
Merge pull request #235 from rasika/master
Fixing https://wso2.org/jira/browse/IOTS-356
|
2017-01-04 19:53:06 +05:30 |
|
Rasika Perera
|
d93d9dd0a6
|
Fixing https://wso2.org/jira/browse/IOTS-356
|
2017-01-04 19:20:16 +05:30 |
|
Ace
|
70c656b5d4
|
reverting commit related to identity version bump
|
2017-01-04 18:18:29 +05:30 |
|
Ace
|
eaea7ff37f
|
Merging with master
|
2017-01-04 18:03:08 +05:30 |
|
Ace
|
04128c7ee3
|
Making h2 db shareable between das and iot core
|
2017-01-04 17:51:37 +05:30 |
|
charitha
|
15d3a124b0
|
Increment plugin deployer version
|
2017-01-04 10:14:13 +05:30 |
|
sinthuja
|
1c203e0f61
|
Merge remote-tracking branch 'origin/master'
|
2017-01-03 13:35:25 +05:30 |
|
sinthuja
|
970bb35260
|
Adding sso by default for analytics portal application.
|
2017-01-03 13:35:08 +05:30 |
|
Ruwan
|
172f41d8da
|
Merge pull request #233 from rasika/master
Fixing IoTS version issue
|
2017-01-03 12:31:41 +05:30 |
|
Rasika Perera
|
6866ee8f24
|
Fixing IoTS version issue
|
2017-01-03 12:25:08 +05:30 |
|
Ace
|
b22bfa88e6
|
Bumping IS versions to latest ones
|
2017-01-02 16:00:01 +05:30 |
|
GPrathap
|
24b6d4dc0e
|
added org.wso2.carbon.apimgt.rest.api.dcr.feature
|
2017-01-02 14:41:59 +05:30 |
|
GPrathap
|
9192f8e65c
|
updated designer.json
|
2017-01-02 14:34:38 +05:30 |
|
Menaka Jayawardena
|
329407d318
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2017-01-02 12:24:20 +05:30 |
|
Dimuth
|
37789891e7
|
location-data-visualizer sample added to product-iots/modules/samples
|
2017-01-01 21:48:49 +05:30 |
|
Rasika Perera
|
598a41e964
|
Merge pull request #230 from rasika/master
Upgrading CDMF and CDMF-plugins
|
2016-12-25 07:55:20 +05:30 |
|
Rasika Perera
|
36480c3c80
|
Upgrading CDMF and CDMF-plugins
|
2016-12-25 07:54:31 +05:30 |
|
WSO2 Builder
|
4cd01294ff
|
[maven-release-plugin] prepare for next development iteration
|
2016-12-24 20:40:57 +00:00 |
|
WSO2 Builder
|
990d941c75
|
[maven-release-plugin] prepare release v3.0.0-BETA
|
2016-12-24 20:34:55 +00:00 |
|
Rasika Perera
|
879a3b1c5b
|
Upgrading CDMF and CDMF-plugins
|
2016-12-25 01:58:25 +05:30 |
|
Menaka Jayawardena
|
53843181f7
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-12-23 12:27:38 +05:30 |
|
Ace
|
36ec90b681
|
Bumping oauth dependencies
|
2016-12-22 15:42:17 +05:30 |
|
Ace
|
6fa320f8bb
|
Updating identity/auth-saml dependencies to latest
|
2016-12-22 11:02:36 +05:30 |
|
Supun94
|
91cf3015a4
|
Minor refactoring on cdm-config file
|
2016-12-22 10:51:56 +05:30 |
|
Supun94
|
4e845dcc37
|
Changing cdm-config file
|
2016-12-22 10:51:56 +05:30 |
|
Rasika Perera
|
a3b3d92be0
|
Disable hostname verification for opensaml http-client
|
2016-12-22 08:31:14 +05:30 |
|
charitha
|
ea333d897e
|
Remove carbon console UI from MB
|
2016-12-20 12:31:13 +05:30 |
|
charitha
|
05ab111437
|
Merge branch 'master' of https://github.com/madawas/product-iots
|
2016-12-19 15:39:53 +05:30 |
|
Ace
|
d48f4e03ea
|
Adding iot-core specific is bundles to accomodate appm identity version upgrade
|
2016-12-19 15:26:43 +05:30 |
|
Ace
|
fefd0ab3e2
|
upgrading to latest version of identity
|
2016-12-19 11:38:18 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
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 |
|
Rasika Perera
|
b7bc800cec
|
Replacing application-authentication.xml from IoT
|
2016-12-07 14:53:28 +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 |
|
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 |
|
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
|
ae96430e0d
|
Adding /devicemgt/login as authentication url when sso enabled
|
2016-12-06 10:59:45 +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 |
|
Chatura Dilan
|
5cd3b6a2a8
|
Adding appstore module
|
2016-12-05 13:50:18 +05:30 |
|
GPrathap
|
9ec723966d
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-12-02 18:59:33 +05:30 |
|
GPrathap
|
47a9d9a767
|
added mb related new configurations
|
2016-12-02 18:58:26 +05:30 |
|
Rasika Perera
|
fe8beb5eb2
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-12-02 08:56:28 +05:30 |
|
charitha
|
6fb07cfe40
|
Bump versions to next development
|
2016-12-01 20:43:00 +05:30 |
|
WSO2 Builder
|
58a2eafffb
|
[maven-release-plugin] prepare for next development iteration
|
2016-12-01 14:58:06 +00:00 |
|
WSO2 Builder
|
72e39a9603
|
[maven-release-plugin] prepare release v1.0.0-ALPHA4
|
2016-12-01 14:55:56 +00:00 |
|
charitha
|
5398c691a7
|
Bump versions to released component versions
|
2016-12-01 20:16:40 +05:30 |
|
Rasika Perera
|
346a50fc64
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-12-01 17:05:41 +05:30 |
|
Rasika Perera
|
ebe22410c4
|
Adding missing certificate management web apps features
|
2016-12-01 16:45:42 +05:30 |
|
Megala
|
090da79419
|
Removing roles and commented lines
|
2016-12-01 15:45:58 +05:30 |
|
Megala
|
ccd6184c9a
|
Adding fixes for sso and making sso by default for all the jaggery apps
|
2016-12-01 14:22:22 +05:30 |
|
Charitha Goonetilleke
|
913d974cdf
|
Merge pull request #204 from hasuniea/IoTS-1.0.0
adding windows feature to plugins-deployer.xml
|
2016-11-30 11:45:07 +05:30 |
|
sinthuja
|
ccb7d837b8
|
adding the iot geo fencing dashboard.
|
2016-11-28 01:35:37 +05:30 |
|
charitha
|
50c456b04f
|
Bump versions to next development
|
2016-11-25 16:31:25 +05:30 |
|
WSO2 Builder
|
5e2b243ee3
|
[maven-release-plugin] prepare for next development iteration
|
2016-11-25 10:41:48 +00:00 |
|
WSO2 Builder
|
9828edda94
|
[maven-release-plugin] prepare release 1.0.0-ALPHA3
|
2016-11-25 10:39:21 +00:00 |
|
charitha
|
7908154d40
|
Bump versions to released component versions
|
2016-11-25 15:47:29 +05:30 |
|
Hasunie
|
3f569d4691
|
adding windows feature to plugins-deployer.xml
|
2016-11-24 09:19:50 +05:30 |
|
ayyoob
|
119aff7fc4
|
Merge branch 'master' of https://github.com/wso2/product-iots into IoTS-1.0.0
|
2016-11-21 19:24:05 +05:30 |
|
ayyoob
|
f3f082568f
|
removed feature listener
|
2016-11-21 19:23:55 +05:30 |
|
ayyoob
|
f132818459
|
renamed default idp name
|
2016-11-21 19:14:48 +05:30 |
|
sinthuja
|
0b86f76362
|
Adding some fixes for android analytics.
|
2016-11-21 17:15:38 +05:30 |
|
ayyoob
|
8083f0350b
|
removed unused components
|
2016-11-20 02:38:05 +05:30 |
|
ayyoob
|
caf65dcfb7
|
removed matt-gateway-profile generation
|
2016-11-17 23:33:46 +05:30 |
|
ayyoob
|
c01ca30a79
|
Merge branch 'master' of https://github.com/wso2/product-iots into IoTS-1.0.0
|
2016-11-17 20:23:04 +05:30 |
|
ayyoob
|
857b4360dd
|
Merge branch 'IoTS-1.0.0' of https://github.com/wso2/product-iots into IoTS-1.0.0
|
2016-11-17 20:19:46 +05:30 |
|
ayyoob
|
7373de0a7a
|
removed features tmp directory
|
2016-11-17 20:18:47 +05:30 |
|
sinthuja
|
62280f4e1a
|
Removing the integration tests from core module to main module.
|
2016-11-17 12:17:11 +05:30 |
|
charitha
|
2c2f7ccd25
|
Bump versions to next development
|
2016-11-16 21:27:53 +05:30 |
|
WSO2 Builder
|
686d3be678
|
[maven-release-plugin] prepare for next development iteration
|
2016-11-16 15:34:29 +00:00 |
|
WSO2 Builder
|
80aaefe75f
|
[maven-release-plugin] prepare release v1.0.0-ALPHA2
|
2016-11-16 15:32:27 +00:00 |
|
charitha
|
3ff3207ac1
|
Set broker version to be same as the core version
|
2016-11-16 20:41:22 +05:30 |
|
charitha
|
93ecdd3428
|
Update cdmf plugins version
|
2016-11-16 20:23:48 +05:30 |
|
Ace
|
4d44095714
|
Renaming samples to plugins
|
2016-11-16 17:44:35 +05:30 |
|
sinthuja
|
44af7334cf
|
Removing the samples directory from the core distribution.
|
2016-11-16 16:31:07 +05:30 |
|
sinthuja
|
6a5ac2be1f
|
Removing mqtt profile from core distribution, and adding the version to pack.
|
2016-11-16 16:24:28 +05:30 |
|
sinthuja
|
658cc1a157
|
Updating the module names according to the convention.
|
2016-11-16 15:48:49 +05:30 |
|
sinthuja
|
41bc7b038c
|
Removing some unnecessary sources from the broker module.
|
2016-11-16 15:45:22 +05:30 |
|
sinthuja
|
6d1c377ab2
|
Merge remote-tracking branch 'origin/IoTS-1.0.0' into IoTS-1.0.0
|
2016-11-16 14:46:48 +05:30 |
|
sinthuja
|
e6d6c5f178
|
Removing some unnecessary sources from the analytics module.
|
2016-11-16 14:45:58 +05:30 |
|
charitha
|
669ab894f9
|
Update component versions for IoTS-1.0.0 release
|
2016-11-16 13:33:26 +05:30 |
|
sinthuja
|
4e29b177f0
|
Merge branch 'iot-product-restructure' into IoTS-1.0.0-fresh2
# Conflicts:
# modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/DeviceAccessBasedMQTTAuthorizer.java
# modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/internal/AuthorizationDataHolder.java
# modules/core/iot-extensions/components/mb-extensions/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization/src/main/java/org/wso2/carbon/andes/extensions/device/mgt/mqtt/authorization/internal/AuthorizationServiceComponent.java
# modules/core/iot-extensions/components/mb-extensions/pom.xml
# modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/src/main/resources/build.properties
# modules/core/iot-extensions/features/mb-extensions-feature/org.wso2.carbon.andes.extensions.device.mgt.mqtt.authorization.feature/src/main/resources/p2.inf
# modules/core/iot-extensions/features/mb-extensions-feature/pom.xml
# modules/distribution/src/samples-deployer.xml
# pom.xml
|
2016-11-10 22:00:42 +05:30 |
|
sinthuja
|
617699693e
|
Changing the JVM startup order, and adding trap for stoping the servers.
|
2016-11-10 21:48:36 +05:30 |
|
sinthuja
|
3349db1757
|
Changing the JVM startup order
|
2016-11-10 21:37:34 +05:30 |
|
sinthuja
|
15a4f4dd4f
|
Fixing some issues in the broker distribution, and the analytics distribution.
|
2016-11-10 21:21:48 +05:30 |
|
sinthuja
|
2992d9e098
|
adding samples to the root location.
|
2016-11-09 17:55:24 +05:30 |
|
sinthuja
|
5ca98782fd
|
Fixing issues in the sample integration.
|
2016-11-09 16:40:14 +05:30 |
|
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 |
|
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 |
|
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 |
|
ayyoob
|
4a4412b927
|
disabled mobile feature installation
|
2016-11-07 00:52:06 +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 |
|
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 |
|
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
|
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 |
|
sinthuja
|
6454c5b0df
|
Removing DAS
|
2016-11-02 11:09:14 +05:30 |
|
ayyoob
|
59207f9980
|
merged with origin IoTS-1.0.0
|
2016-11-02 09:44:30 +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 |
|
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 |
|
ayyoob
|
81efa0e2c7
|
updated plugins version
|
2016-10-23 14:18:03 +05:30 |
|
ayyoob
|
45348c2a0a
|
added deployer features to p2 profile
|
2016-10-23 01:24:07 +05:30 |
|
susinda
|
12c12067c7
|
Merge remote-tracking branch 'upstream/master'
|
2016-10-21 12:41:46 +05:30 |
|
ayyoob
|
a6dac9a19e
|
resolved default api invocation issue
|
2016-10-10 20:47:56 +05:30 |
|
ayyoob
|
2b31921bd5
|
added configurations
|
2016-10-09 19:11:00 +05:30 |
|
ayyoob
|
b2d20b93e1
|
few changes after apimgt version upgrade
|
2016-10-09 03:16:28 +05:30 |
|
susinda
|
425d420773
|
Adding certMgt to dbscripts folder
|
2016-10-04 17:41:57 +05:30 |
|
Rasika Perera
|
d246557763
|
Upgrading CDMF and CDMF plugins versions
|
2016-10-03 08:40:11 +05:30 |
|
Rasika Perera
|
2825269e4b
|
Merge branch 'master' of https://github.com/rasika/product-iots
|
2016-09-29 16:17:58 +05:30 |
|
Rasika Perera
|
b8aacdcf40
|
Merge pull request #1 from warunalakshitha/master
Upgrade to carbon 4.4.9
|
2016-09-29 11:24:40 +05:30 |
|
warunalakshitha
|
6ef4bb4a9b
|
Remove org.wso2.carbon.event.server featre from p2 since feature has been removed from carbon commons
|
2016-09-29 01:18:10 +05:30 |
|
warunalakshitha
|
eaf8da4548
|
Upgrade iot product features to latest identity and carbon version
|
2016-09-29 01:13:40 +05:30 |
|
warunalakshitha
|
b24ec4e36a
|
Upgrade to carbon 4.4.9
|
2016-09-29 01:02:43 +05:30 |
|
warunalakshitha
|
af5c886907
|
Add akka reference file and registry-event-broker.xml
|
2016-09-29 01:01:55 +05:30 |
|
warunalakshitha
|
587c792b91
|
Fix hostname verfication issue
|
2016-09-29 01:00:49 +05:30 |
|
warunalakshitha
|
f1777e67ea
|
Move carbon kernal version to 4.4.9
|
2016-09-29 00:59:09 +05:30 |
|
warunalakshitha
|
9a3fcccf63
|
Update api-manager.xml to 6.0.5 version
|
2016-09-29 00:58:05 +05:30 |
|
warunalakshitha
|
82a352242c
|
Update api manager db scripts to 6.0.5 version
|
2016-09-29 00:57:29 +05:30 |
|
Rasika Perera
|
d47864db8a
|
Fixing invalid invoker util URLs
|
2016-09-27 21:46:59 +05:30 |
|
Rasika Perera
|
9329e14bc1
|
Fixing invalid invoker util URLs
|
2016-09-27 21:42:26 +05:30 |
|
Rasika Perera
|
3b3bf6b854
|
Updating CDMF-plugins version for samples
|
2016-09-27 21:05:52 +05:30 |
|
Rasika Perera
|
70b1f9374c
|
Fixing incorrect device object returned from JS to Hbs templates
|
2016-09-27 20:45:13 +05:30 |
|
Rasika Perera
|
eb3c68d895
|
Adding certificate management schema generation
|
2016-09-22 16:50:29 +05:30 |
|
Rasika Perera
|
d01f58186d
|
Copying product specific cdm-config.xml for enabling custom PushNotificationProviders such as XMPP, MQTT
|
2016-09-21 00:59:55 +05:30 |
|
Rasika Perera
|
bb29f61dbe
|
Removed GCM notification adapter feature
|
2016-09-21 00:59:55 +05:30 |
|
Rasika Perera
|
75a34b3b20
|
Updating samples cdmf and cdmf plugins versions into snapshots
|
2016-09-21 00:59:55 +05:30 |
|
Rasika Perera
|
3ccb57747d
|
Updating samples version
|
2016-09-21 00:59:55 +05:30 |
|
Rasika Perera
|
cf56008672
|
Updating cdmf and cdmf-plugins versions in samples
|
2016-09-21 00:59:55 +05:30 |
|
Rasika Perera
|
a922fb5a0c
|
Adding changes to the devicemgt app copy
|
2016-09-13 17:55:40 +05:30 |
|
ayyoob
|
70483aacde
|
merged with upstream
|
2016-07-28 17:03:08 +05:30 |
|
ayyoob
|
dca55c7385
|
fixed formatting issues and removed storing error message
|
2016-07-28 15:40:55 +05:30 |
|
ayyoob
|
c9736707ca
|
fixed the formatting issues.
|
2016-07-28 15:37:16 +05:30 |
|
ayyoob
|
1033dfd40e
|
added missng log trace
|
2016-07-28 15:22:07 +05:30 |
|
ayyoob
|
f072fb260a
|
Changed to commons logging
|
2016-07-28 14:43:24 +05:30 |
|
ayyoob
|
5991eeec58
|
added missing log
|
2016-07-28 14:32:30 +05:30 |
|
ayyoob
|
9c82589af2
|
fixed formatting issues
|
2016-07-28 14:28:28 +05:30 |
|
Milan Perera
|
aeef79b47e
|
Merge pull request #180 from ayyoob/das-ext
few changes in real time analytics
|
2016-07-28 14:13:50 +05:30 |
|
ayyoob
|
971fd80b83
|
few changes in real time analytics
|
2016-07-27 14:45:55 +05:30 |
|
Ace
|
1bbaf13b5c
|
Updating sample webapp name
|
2016-07-26 11:24:22 +05:30 |
|
charitha
|
0a61e29641
|
Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/70
|
2016-07-23 11:33:23 +05:30 |
|
charitha
|
66470f145b
|
Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/118
|
2016-07-23 11:14:59 +05:30 |
|
charitha
|
f071ce0d84
|
Fix issues mentioned in PR https://github.com/wso2/product-iots/pull/83
|
2016-07-23 10:51:14 +05:30 |
|
charitha
|
1b42f08a01
|
Fix issues in PR https://github.com/wso2/product-iots/pull/151
|
2016-07-21 17:50:11 +05:30 |
|
charitha
|
35a47f81b0
|
Fix issues in PR https://github.com/wso2/product-iots/pull/151
|
2016-07-21 17:43:49 +05:30 |
|
charitha
|
258d059ddb
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-07-21 10:47:47 +05:30 |
|
charitha
|
3ed272f22e
|
Remove wso2 license text from 3rd party libraries
|
2016-07-21 10:47:15 +05:30 |
|
charitha
|
c9d51df3cb
|
Fix issues in PR https://github.com/wso2/product-iots/pull/172
|
2016-07-21 10:44:57 +05:30 |
|
Ace
|
288a523c23
|
Updating IoTS device.mgt versions
|
2016-07-13 14:42:59 +05:30 |
|
charitha
|
c1bb8a0c6d
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-06-30 10:36:39 +05:30 |
|
charitha
|
959792a09d
|
Update agent code and analytics scripts. Fixed bugs
|
2016-06-30 10:36:22 +05:30 |
|
GPrathap
|
140e1c7571
|
adding carbon app
|
2016-06-30 00:18:54 +05:30 |
|
charitha
|
e642939b6c
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-06-29 20:23:43 +05:30 |
|
charitha
|
3f533e2288
|
Update agent code and analytics scripts. Fixed bugs
|
2016-06-29 20:23:18 +05:30 |
|
GPrathap
|
db60cb9690
|
adding real-time analytics view
|
2016-06-29 19:48:21 +05:30 |
|
GPrathap
|
e44b6ca710
|
adding real-time analytics view
|
2016-06-29 19:47:17 +05:30 |
|
charitha
|
8478f1ebf0
|
Update agent code and analytics scripts. Fixed bugs
|
2016-06-29 11:45:53 +05:30 |
|
Ruwan
|
f5bb1b5a78
|
Merge pull request #173 from sahan-kariyawasam/master
Adding ui functionality for doormanager application
|
2016-06-27 17:39:26 +05:30 |
|
Ruwan
|
cb39eb665c
|
Merge pull request #170 from GPrathap/master
adding new device type: geolocationTracker
|
2016-06-27 17:39:18 +05:30 |
|
Sahan Kariyawasam
|
67a7271299
|
Adding ui functionality for doormanager application
|
2016-06-27 17:15:58 +05:30 |
|
charitha
|
d5a56c4620
|
Add Smart Water Tank device type
|
2016-06-27 09:55:37 +05:30 |
|
Ruwan
|
44a0a61a85
|
Merge pull request #171 from ayyoob/das-ext
few changes added after testing with the cluster
|
2016-06-27 05:51:56 +05:30 |
|
ayyoob
|
2df0515585
|
few changes added after testing with the cluster
|
2016-06-27 00:13:34 +05:30 |
|
GPrathap
|
fab8e8f738
|
adding new device type: geolocationTracker
|
2016-06-26 18:23:42 +05:30 |
|
GPrathap
|
1f06c08f0d
|
adding new device type: door manager
|
2016-06-22 18:54:20 +05:30 |
|
GPrathap
|
6193a0421a
|
removing older sample: doormanager
|
2016-06-22 18:43:11 +05:30 |
|
Ruwan
|
62a602848f
|
Merge pull request #168 from ayyoob/das-ext
Added device scope based authorisation for mqtt
|
2016-06-20 05:48:45 +05:30 |
|
ayyoob
|
97bf77f16c
|
removed xmpp and mqtt properties
|
2016-06-20 02:58:46 +05:30 |
|
ayyoob
|
1dd689e8d4
|
Added device scope based authorisation for mqtt
|
2016-06-20 02:35:26 +05:30 |
|
Ruwan
|
3af6b875f1
|
Merge pull request #167 from ayyoob/das-ext
added a configuration ui to connected cup
|
2016-06-17 18:09:44 +05:30 |
|
ayyoob
|
599ad73a72
|
added a configuration ui to connected cup
|
2016-06-17 17:22:04 +05:30 |
|
Ruwan
|
6e2838bdbf
|
Merge pull request #166 from GPrathap/master
code refactoring
|
2016-06-13 09:42:07 +05:30 |
|
GPrathap
|
4a7beac606
|
code refactoring
|
2016-06-12 21:05:17 +05:30 |
|
ayyoob
|
521f3b478a
|
add removed libthrift 0.8
|
2016-06-10 15:35:09 +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 |
|
Ruwan
|
67d0b9ab72
|
Merge pull request #162 from sidias/patch-1
UI issues fixed
|
2016-06-09 13:30:31 +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 |
|
GPrathap
|
93a9f90277
|
overriding default designer.json which is coming from portal app
|
2016-06-09 13:05:35 +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 |
|
ayyoob
|
5933702725
|
added http-gateway, mqtt-gateway, devicetype-publisher, devicetype-worker and device-key-manager profiles
|
2016-06-08 22:36:53 +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 |
|
Ruwan
|
0ebfe2b8c0
|
Merge pull request #158 from sidias/master
resolving pom issues
|
2016-06-08 12:25:24 +05:30 |
|
buddhinipun
|
c1f3a670b5
|
resolving pom issues
|
2016-06-08 12:21:32 +05:30 |
|
GPrathap
|
d1a404da6d
|
fixing IOTS-201
|
2016-06-08 09:27:53 +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 |
|
ayyoob
|
47e6331c93
|
removed device type features and added mqtt profile
|
2016-06-07 14:28:07 +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 |
|
mharindu
|
f8e3e9f87c
|
Merge branch 'master' of https://github.com/wso2/product-iots into apim
|
2016-06-06 09:11:36 +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 |
|
Ruwan
|
703a563527
|
Merge pull request #151 from charithag/master
Update firealarm to comply with latest modifications
|
2016-06-02 10:53:07 +05:30 |
|
GPrathap
|
6490c010f8
|
added analytics cdmf feature
|
2016-06-02 10:34:43 +05:30 |
|
charitha
|
5a463e4194
|
Fix bugs in generated firealarm plugin
|
2016-06-02 10:25:43 +05:30 |
|
charitha
|
6d530d684e
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-06-02 09:04:27 +05:30 |
|
charitha
|
80ff8613b2
|
Update firealarm to comply with latest modifications
|
2016-06-01 15:07:39 +05:30 |
|
GPrathap
|
39dcaa1460
|
added analytics dashboard feature
|
2016-06-01 12:16:54 +05:30 |
|
mharindu
|
11c3c783c2
|
Added new sequences to APIM
|
2016-05-30 11:51:34 +05:30 |
|
ayyoob
|
8568a704ea
|
fixed https://wso2.org/jira/browse/IOTS-184
|
2016-05-26 12:51:15 +05:30 |
|
ayyoob
|
9289e9840b
|
removed UI Publisher
|
2016-05-24 19:27:16 +05:30 |
|
ayyoob
|
97ac29c7ba
|
Merge branch 'release-1.0.0-alpha' of https://github.com/wso2/product-iots into das-ext
|
2016-05-23 13:02:47 +05:30 |
|
mharindu
|
350beff9a0
|
[maven-release-plugin] prepare for next development iteration
|
2016-05-20 22:56:51 +05:30 |
|
mharindu
|
45a1e52aea
|
[maven-release-plugin] prepare release v1.0.0-alpha
|
2016-05-20 22:56:41 +05:30 |
|
mharindu
|
fe5c6926df
|
Removed clean plugin
|
2016-05-20 22:49:04 +05:30 |
|
mharindu
|
c8cd3be0fd
|
[maven-release-plugin] rollback the release of v1.0.0-alpha
|
2016-05-20 22:44:38 +05:30 |
|
mharindu
|
7e998d13ca
|
[maven-release-plugin] prepare for next development iteration
|
2016-05-20 22:34:57 +05:30 |
|
mharindu
|
ec1170afc6
|
[maven-release-plugin] prepare release v1.0.0-alpha
|
2016-05-20 22:34:47 +05:30 |
|
mharindu
|
f79d45f432
|
Removed group id from cdmf-devicetype
|
2016-05-20 22:03:34 +05:30 |
|
mharindu
|
6c13f3b51f
|
[maven-release-plugin] rollback the release of v1.0.0-alpha
|
2016-05-20 22:00:44 +05:30 |
|
mharindu
|
aea3f2594a
|
[maven-release-plugin] prepare for next development iteration
|
2016-05-20 21:10:34 +05:30 |
|
mharindu
|
181ac25ba8
|
[maven-release-plugin] prepare release v1.0.0-alpha
|
2016-05-20 21:09:36 +05:30 |
|
mharindu
|
8707d41603
|
Fixed pom errors
|
2016-05-20 20:57:40 +05:30 |
|
mharindu
|
2fce3a94ea
|
Removed unnecessary comments
|
2016-05-20 20:46:02 +05:30 |
|
mharindu
|
2392badf70
|
Added license text
|
2016-05-20 20:23:51 +05:30 |
|
mharindu
|
f32792788b
|
Updated README, release-notes
|
2016-05-20 18:53:52 +05:30 |
|
mharindu
|
073b9da935
|
Upgraded versions
|
2016-05-20 18:07:59 +05:30 |
|
ayyoob
|
8c14d86eb0
|
removed identity dbscripts
|
2016-05-19 18:38:55 +05:30 |
|
ayyoob
|
57fd20291b
|
resolving coffeecup issues
|
2016-05-19 03:50:30 +05:30 |
|
mharindu
|
870009915f
|
Removed api-publisher
|
2016-05-19 01:14:58 +05:30 |
|
mharindu
|
401a07540e
|
Merge branch 'master' of https://github.com/wso2/product-iots into apim
|
2016-05-19 00:56:41 +05:30 |
|
sumedharubasinghe
|
e50ee7edad
|
Merge pull request #141 from ayyoob/das-ext
removing mdm archtype
|
2016-05-19 00:40:47 +05:30 |
|
prabathabey
|
cba9d8baaa
|
Adding virtual-fire-alarm-config.xml
|
2016-05-19 00:22:45 +05:30 |
|
ayyoob
|
99c693bcae
|
few fixes after testing
|
2016-05-18 19:34:07 +05:30 |
|
GPrathap
|
8e71da6c15
|
appended tenant domain to username
|
2016-05-18 10:17:21 +05:30 |
|
GPrathap
|
c2d1879483
|
fix typo
|
2016-05-17 22:51:51 +05:30 |
|
GPrathap
|
3b819cab1d
|
add mssql and oracle db scripts
|
2016-05-17 22:50:17 +05:30 |
|
GPrathap
|
2b68b48f4c
|
removed copy link section from UI
|
2016-05-17 22:49:26 +05:30 |
|
ayyoob
|
9e8181c226
|
removing mdm archtype
|
2016-05-17 21:15:48 +05:30 |
|
ayyoob
|
0a2860d0d4
|
cleaning datasources
|
2016-05-17 21:14:53 +05:30 |
|
GPrathap
|
2a59c23a55
|
added touch points to unconfigure installed device plugin
|
2016-05-17 19:04:46 +05:30 |
|
GPrathap
|
8a013279a4
|
merged controller and manager apis
|
2016-05-17 18:55:45 +05:30 |
|
GPrathap
|
7ab6046d31
|
did some UI changes
|
2016-05-17 18:52:52 +05:30 |
|
GPrathap
|
f92f3f9692
|
added mqtt configuration and mqtt output adapter listener
|
2016-05-17 18:47:43 +05:30 |
|
GPrathap
|
470778fb48
|
added mqtt event receiver and updated existing analytics scripts
|
2016-05-17 18:45:01 +05:30 |
|
GPrathap
|
e8e648ce76
|
renamed table name and graph axes labels
|
2016-05-17 18:42:27 +05:30 |
|
GPrathap
|
3e561a6ccf
|
updated event stream payload
|
2016-05-17 18:39:13 +05:30 |
|
GPrathap
|
92378287af
|
updated event stream payload
|
2016-05-17 18:37:16 +05:30 |
|
GPrathap
|
1ee6231b75
|
added output event adapter dependencies
|
2016-05-17 18:31:10 +05:30 |
|
GPrathap
|
cb37583a3c
|
added some file filers to process selected *.js and *.car file types
|
2016-05-17 18:28:31 +05:30 |
|
mharindu
|
bc72c16647
|
Merge branch 'master' of https://github.com/wso2/product-iots into apim
|
2016-05-17 12:25:41 +05:30 |
|
mharindu
|
46c054d567
|
Removed analytics from APIM fault sequence
|
2016-05-17 09:01:23 +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 |
|
mharindu
|
b69a539aee
|
Added new logs
|
2016-05-16 14:16:24 +05:30 |
|
mharindu
|
9307bf1f0b
|
Fixed conflicts
|
2016-05-16 12:09:08 +05:30 |
|
mharindu
|
d239a5efb7
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-05-16 12:08:16 +05:30 |
|
mharindu
|
d2e914e275
|
Added new configuration for the webapp publisher and scope validator
|
2016-05-16 12:07:57 +05:30 |
|
ayyoob
|
b6882f8fbe
|
fixed https://wso2.org/jira/browse/IOTS-153
|
2016-05-15 21:29:07 +05:30 |
|
ayyoob
|
a92eb8bd34
|
refactored connected cup apis
|
2016-05-15 17:46:30 +05:30 |
|
Ace
|
19775a7c99
|
Adding comments to config file
|
2016-05-15 01:35:08 +05:30 |
|
Ace
|
01ab2a5ce4
|
Adding device type deployment location property
|
2016-05-15 01:18:13 +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 |
|
mharindu
|
5a3bdb599f
|
Added new log4j.properties
|
2016-05-12 23:00:33 +05:30 |
|
mharindu
|
b777fa9764
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-05-12 22:05:07 +05:30 |
|
mharindu
|
566c5e5fb5
|
fixed issues in API publishing
|
2016-05-12 22:02:47 +05:30 |
|
ayyoob
|
e5d5afa9a0
|
added remote app manager config
|
2016-05-12 19:18:20 +05:30 |
|
ayyoob
|
a5be8acd45
|
Merge branch 'master' of https://github.com/wso2/product-iots into das-ext
|
2016-05-12 13:45:39 +05:30 |
|
ayyoob
|
14ead035d7
|
few changed mqtt authoriser
|
2016-05-12 13:39:44 +05:30 |
|
ayyoob
|
787178ddff
|
added mqtt and xmpp.properties
|
2016-05-12 02:43:10 +05:30 |
|
prabathabey
|
cacd5bf5ae
|
Adding APILifeCycle.xml
|
2016-05-11 16:56:40 +05:30 |
|
prabathabey
|
18c3f1dfd5
|
Removing api-mgt startup publisher feature and other redundant feature definitions
|
2016-05-10 22:44:49 +05:30 |
|
prabathabey
|
ab32e91501
|
Removing try-it and Siddhi try-it features
|
2016-05-10 22:42:17 +05:30 |
|
prabathabey
|
1e3454dc46
|
Removing jaggery-test dependency
|
2016-05-10 22:29:28 +05:30 |
|
prabathabey
|
125e398dab
|
Removing all mobile related dependencies
|
2016-05-10 22:21:56 +05:30 |
|
prabathabey
|
9548b88dad
|
Removing app-mgt dependencies
|
2016-05-10 22:12:25 +05:30 |
|
prabathabey
|
a98849b20f
|
Removing API-mgt publisher feature
|
2016-05-10 21:30:15 +05:30 |
|
ayyoob
|
8bc2b482fe
|
update on log4j.properties
|
2016-05-09 01:06:09 +05:30 |
|
ayyoob
|
44662c625b
|
create mb extension for authorisation
|
2016-05-09 01:05:55 +05:30 |
|
ayyoob
|
02851637b3
|
removed das input adapters
|
2016-05-08 02:50:40 +05:30 |
|
GPrathap
|
ee304f1724
|
added SAML2 Web SSO federated authenticator
|
2016-05-06 21:01:20 +05:30 |
|
GPrathap
|
384c1f35b3
|
removed unused code
|
2016-05-05 22:24:16 +05:30 |
|
GPrathap
|
b40e5b4bb1
|
corrected subscribe topic format
|
2016-05-05 22:23:26 +05:30 |
|
ayyoob
|
046e646e8f
|
Merge branch 'master' of https://github.com/wso2/product-iots into das-ext
|
2016-05-04 05:00:19 +05:30 |
|
ayyoob
|
652545b49a
|
added release note
|
2016-05-04 04:45:50 +05:30 |
|
GPrathap
|
5f38afa77c
|
change group id
|
2016-05-04 04:12:44 +05:30 |
|
sumedharubasinghe
|
71b13f0dcc
|
Merge pull request #129 from GPrathap/master
refactoring cdmf-device type-archetype
|
2016-05-04 03:38:05 +05:30 |
|
GPrathap
|
fb0e089518
|
refactoring cdmf-device type-archetype
|
2016-05-04 03:18:47 +05:30 |
|
sumedharubasinghe
|
9fb543ff6d
|
Merge pull request #128 from ayyoob/das-ext
Added few changes after testing
|
2016-05-04 03:17:12 +05:30 |
|
ayyoob
|
a43048679d
|
added device-analytics-config
|
2016-05-04 03:01:27 +05:30 |
|
ayyoob
|
740afcac2a
|
few changes after testing
|
2016-05-04 01:13:54 +05:30 |
|
Rasika Perera
|
a6e1cda740
|
Merge branch 'master' of https://github.com/wso2/product-iots
|
2016-05-04 00:52:08 +05:30 |
|
Rasika Perera
|
29aca290a4
|
Adding group permission checking
|
2016-05-04 00:49:06 +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 |
|
ayyoob
|
ad237ffd34
|
resolved issues in connected cup sample
|
2016-05-03 13:44:08 +05:30 |
|
ayyoob
|
720a57f5df
|
updated IDP config
|
2016-04-29 17:41:05 +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 |
|
ayyoob
|
2a6e42b646
|
resolve server shutdown issues
|
2016-04-24 02:16:27 +05:30 |
|
NuwanSameera
|
2f2c23105a
|
Move digital display and drone analyzer to samples.
|
2016-04-22 15:58:12 +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 |
|
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
|
49466b2953
|
Add devicemgt_admin jax-rs and removed mdm-admin jax-rs
|
2016-04-18 16:42:53 +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
|
f91b566425
|
version update and added das extension feature
|
2016-04-14 19:57:13 +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 |
|
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 |
|
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 |
|
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 |
|
ayyoob
|
69740cc2f2
|
updated APIM version
|
2016-03-23 03:23:13 +05:30 |
|
GPrathap
|
65b4dec1d7
|
adding a new gadget: Data Range Picker
|
2016-03-21 05:55:00 +05:30 |
|
GPrathap
|
824503c0d7
|
adding new theme to dashboard portal application
|
2016-03-20 23:58:47 +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
|
130cad34ee
|
Changes suggested in the Code review.
|
2016-03-14 19:50:50 +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 |
|
Menaka Madushanka
|
0333007b1f
|
Changes suggested in the Code review.
|
2016-03-14 17:41:23 +05:30 |
|
NuwanSameera
|
0e01164874
|
Merge branch 'master' of https://github.com/ayyoob/product-iot-server
|
2016-03-14 12:44:57 +05:30 |
|
Menaka Madushanka
|
eb77b572e7
|
Fixes
|
2016-03-14 12:28:03 +05:30 |
|
Menaka Madushanka
|
d7565e7fe7
|
Minor fixes
|
2016-03-14 11:18:47 +05:30 |
|
NuwanSameera
|
aeb3ef20ac
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-14 10:14:02 +05:30 |
|
Menaka Madushanka
|
d71b00d925
|
Added constants.
|
2016-03-14 10:04:42 +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 |
|
GPrathap
|
bd856c0b75
|
refactoring code
|
2016-03-13 21:28:12 +05:30 |
|
GPrathap
|
70fcea507d
|
changed source code according to new API changes
|
2016-03-13 21:27:28 +05:30 |
|
GPrathap
|
4f6ab8f6f6
|
changed group id cdmf.devicetype into org.wso2.cdmf.devicetype
|
2016-03-13 21:06:27 +05:30 |
|
Menaka Madushanka
|
e3f8956d29
|
package refactoring
|
2016-03-12 14:44:10 +05:30 |
|
NuwanSameera
|
ee250d25c5
|
Add permissions.xml to connected-cup device type.
|
2016-03-11 19:16:09 +05:30 |
|
Menaka Madushanka
|
0ac1c73efe
|
License headers added.
|
2016-03-11 11:39:06 +05:30 |
|
Menaka Madushanka
|
eac16a5d14
|
Code formatting
|
2016-03-11 11:31:51 +05:30 |
|
Menaka Madushanka
|
4cf1d77311
|
Added javadoc comments
|
2016-03-11 10:59:43 +05:30 |
|
Menaka Madushanka
|
ef9c3dfe70
|
Added comments and code restructured.
|
2016-03-10 20:19:37 +05:30 |
|
charithag
|
706002b4d5
|
Fix for https://wso2.org/jira/browse/IOTS-77
|
2016-03-10 19:25:50 +05:30 |
|
Menaka Madushanka
|
0ce1d75c61
|
Class name changed
|
2016-03-10 18:30:09 +05:30 |
|
Menaka Madushanka
|
6858fb8a85
|
Code cleanup and refactoring : Check alert is displayed
|
2016-03-10 16:31:43 +05:30 |
|
Menaka Madushanka
|
b930301819
|
Merge remote-tracking branch 'origin/master'
|
2016-03-10 15:06:04 +05:30 |
|
Menaka Madushanka
|
a1b94d5415
|
Code cleanup and refactoring
|
2016-03-10 15:05:44 +05:30 |
|
Menaka Madushanka
|
ead5b6e2bb
|
Completed the sample test cases.
|
2016-03-10 15:04:50 +05:30 |
|
ayyoob
|
7a9b5547bd
|
added feature extraction lifecycle listener
|
2016-03-08 23:58:54 +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 |
|
ayyoob
|
03be540d99
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-03-08 15:52:44 +05:30 |
|
ayyoob
|
66971e4860
|
removed conflicting jars that exports same packages
|
2016-03-08 15:52:09 +05:30 |
|
Charitha Goonetilleke
|
febdc36cba
|
Removed commented code and reformat
|
2016-03-08 13:44:47 +05:30 |
|
Shabirmean
|
d7de0f0607
|
Adding copy tasks for the portal app specific modifications in the bin.xml
|
2016-03-07 09:31:12 +05:30 |
|
Shabirmean
|
8206dc0f92
|
Added the doormanager-icon.png
|
2016-03-07 09:11:35 +05:30 |
|
Shabirmean
|
745d2369d3
|
Added portal app specific analytics changes and IoT-Gadget samples
|
2016-03-07 09:09:02 +05:30 |
|
Menaka Madushanka
|
adfa5762c9
|
Sample Enrollment and verification
|
2016-03-04 11:22:48 +05:30 |
|
charithag
|
6c7041dcda
|
Add ESP8266 based fire alarm sample
|
2016-03-04 10:59:33 +05:30 |
|
charithag
|
f087baaa49
|
Bump event processing version to comply with analytics
|
2016-03-03 16:03:58 +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 |
|
Menaka Madushanka
|
28879b416f
|
Sample installation and verification
|
2016-02-29 18:31:28 +05:30 |
|
charithag
|
6dba086760
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-02-26 11:12:28 +05:30 |
|
Geesara Prathap
|
0a29e01356
|
Update README.md
|
2016-02-25 23:57:26 +05:30 |
|
GPrathap
|
4c2eeb4b2a
|
Fix for JIRA IOTS-80
|
2016-02-25 23:52:21 +05:30 |
|
GPrathap
|
d9f48423e3
|
Fix for JIRA IOTS-79
|
2016-02-25 19:25:06 +05:30 |
|
charithag
|
62d795232e
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-02-25 16:52:46 +05:30 |
|
Menaka Madushanka
|
890209e3de
|
License header updated
|
2016-02-25 14:33:50 +05:30 |
|
Menaka Madushanka
|
98c222ed5e
|
removed the unwanted build.xml file
|
2016-02-25 14:23:18 +05:30 |
|
Menaka Madushanka
|
34951b5395
|
Testng.xml changes
|
2016-02-25 14:22:02 +05:30 |
|
Menaka Madushanka
|
57f91949a3
|
Code formatting and fixes
|
2016-02-25 14:21:24 +05:30 |
|
Menaka Madushanka
|
fcd5669361
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-02-25 11:21:38 +05:30 |
|
Menaka Madushanka
|
9a0f0f2187
|
restart
|
2016-02-25 11:21:18 +05:30 |
|
GPrathap
|
a4695dfb2c
|
added mqtt dependency to sample agent application
|
2016-02-25 08:29:15 +05:30 |
|
Ace
|
7b51e4f36b
|
bumping dependencies to latest versions
|
2016-02-24 16:33:56 +05:30 |
|
GPrathap
|
953b15342f
|
updated README.md
|
2016-02-24 12:17:19 +05:30 |
|
GPrathap
|
d59f7bc089
|
added deployable sample application
|
2016-02-24 11:34:00 +05:30 |
|
Menaka Madushanka
|
67cb3df652
|
Code formatting
|
2016-02-23 18:44:11 +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
|
c7adb5530d
|
Added comments and code cleanup
|
2016-02-12 10:39:25 +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 |
|
Shabirmean
|
8f4093b20f
|
Removed already installed features from the "repository/components/features" folder
|
2016-02-10 17:32:25 +05:30 |
|
Menaka Madushanka
|
d9799fa3c0
|
License headers
|
2016-02-10 14:18:11 +05:30 |
|
Menaka Madushanka
|
0ee834fc16
|
License headers added
|
2016-02-10 14:15:39 +05:30 |
|
Menaka Madushanka
|
f91f4a3555
|
Integration tests for IOT server
|
2016-02-10 12:40:18 +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 |
|
charithag
|
74c04dc49b
|
Merged with CDM master
|
2016-01-28 17:44:10 +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 |
|
Ace
|
94f1b87ce3
|
Removing patches and upgrading DAS and MB
|
2016-01-25 10:47:31 +05:30 |
|
Shabirmean
|
fd0f149c61
|
Merge branch 'master' of https://github.com/wso2-incubator/product-iot-server
|
2016-01-22 18:49:44 +05:30 |
|
Shabirmean
|
9ef829536e
|
Upgraded Paho-MQTT version to latest v1.0.2
|
2016-01-22 18:49:33 +05:30 |
|
GPrathap
|
7bd44f4499
|
removed auto generated device-deployer.xml
|
2016-01-22 14:40:46 +05:30 |
|
Shabirmean
|
390bda1b3a
|
Fixing wrong parent-groupId in the tools module
|
2016-01-20 11:44:06 +05:30 |
|
GPrathap
|
17db3bc651
|
created auto generated device-deployer.xml file
|
2016-01-20 09:40:14 +05:30 |
|
GPrathap
|
84dc857811
|
facilitated to create a feature of given device type dynamically
|
2016-01-19 23:28:53 +05:30 |
|
GPrathap
|
a9750a2680
|
added a new maven archetype to generate sample structure of cdmf device type
|
2016-01-19 14:11:00 +05:30 |
|