24239 Commits

Author SHA1 Message Date
volodymyr-babak
e1a2df9b47 Merge branch 'master' into gatling-mqtt 2016-12-23 18:39:17 +02:00
Andrew Shvayka
7a8cc68fcc Merge pull request #21 from thingsboard/RPC-TESTS
Server-side Two-way MQTT RPC Test
2016-12-23 16:36:42 +02:00
Andrew Shvayka
23531e8033 Merge pull request #20 from volodymyr-babak/master
updated docker tags
2016-12-23 16:36:14 +02:00
Igor Kulikov
459a199878 Fix OpenStreet Map css zIndex 2016-12-23 11:35:09 +02:00
Igor Kulikov
ec188b8e28 Widgets visibility fix 2016-12-22 20:26:05 +02:00
Igor Kulikov
19028c0913 Fix widgets visibility detection. 2016-12-22 18:51:40 +02:00
Valerii Sosliuk
69a51ea33e Server-side Two-way MQTT RPC Test 2016-12-21 08:23:02 -05:00
volodymyr-babak
5e3cd46dbe updated docker tags 2016-12-20 23:24:36 +02:00
Andrew Shvayka
ddc864395a Version set to 1.1.0-SNAPSHOT 2016-12-20 19:24:15 +02:00
Andrew Shvayka
ade23a7906 Update email plugin configuration and query fetch size 2016-12-20 18:51:19 +02:00
Andrew Shvayka
c6e27df325 Version set to 1.0.1 2016-12-20 18:37:41 +02:00
Igor Kulikov
e1073a0f54 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2016-12-20 18:24:28 +02:00
Igor Kulikov
d8443495e8 Fix rotated log files folder 2016-12-20 18:24:14 +02:00
Andrew Shvayka
1d2ac3ebd2 Merge pull request #17 from thingsboard/bug/rules-initialization
Rules initialization fix
2016-12-20 17:53:08 +02:00
Igor Kulikov
163847cddb Merge branch 'master' of https://github.com/thingsboard/thingsboard 2016-12-20 17:32:48 +02:00
Igor Kulikov
b5581a8a32 UI: Add new widget types. Improve dashboard settings. 2016-12-20 17:32:29 +02:00
Andrew Shvayka
6ff2d64974 Plugin update fix 2016-12-20 17:31:05 +02:00
Andrew Shvayka
b04bea6758 Merge pull request #16 from thingsboard/feature/credentials
Credentials revocation
2016-12-20 13:12:56 +02:00
Andrew Shvayka
f6595abbed Build Fix 2016-12-20 12:52:48 +02:00
Andrew Shvayka
dc188605d4 Fix 2016-12-20 12:52:16 +02:00
Andrew Shvayka
58ec7a335a Credentials revocation 2016-12-20 11:50:52 +02:00
Andrew Shvayka
54215215c5 Merge pull request #12 from volodymyr-babak/master
removed redundant links
2016-12-17 20:28:38 +02:00
volodymyr-babak
4e5bb26caf read from file 2016-12-15 17:25:31 +02:00
volodymyr-babak
21d632744c Merge branch 'master' of https://github.com/thingsboard/thingsboard into gatling-mqtt
# Conflicts:
#	tools/pom.xml
#	tools/src/main/java/org/thingsboard/client/tools/MqttStressTestTool.java
2016-12-15 16:20:56 +02:00
volodymyr-babak
64dfb4a7f7 Merge branch 'master' of https://github.com/thingsboard/thingsboard into gatling-mqtt
# Conflicts:
#	tools/pom.xml
#	tools/src/main/java/org/thingsboard/client/tools/MqttStressTestTool.java
2016-12-15 16:19:21 +02:00
volodymyr-babak
ea9c8d2b61 small fix 2016-12-15 16:15:27 +02:00
Igor Kulikov
cb3cb2cd88 Merge branch 'master' of https://github.com/thingsboard/thingsboard 2016-12-15 14:36:36 +02:00
Igor Kulikov
9ee06e0efb Fix version of angular in order to use a stable one. 2016-12-15 14:36:17 +02:00
Andrew Shvayka
baaa26ff13 Mqtt stress test tool 2016-12-15 13:52:44 +02:00
volodymyr-babak
9afa079315 gatling-mqtt skeleton impl 2016-12-15 11:39:10 +02:00
Igor Kulikov
5471325f60 Disable spring boot cache control in order to enable browser caching. 2016-12-15 10:37:30 +02:00
volodymyr-babak
301600ff71 removed redundant links 2016-12-14 23:08:33 +02:00
Andrew Shvayka
6dc6dc063c Merge pull request #11 from thingsboard/feature/cloud
Separate application artifact from spring boot jar
2016-12-14 17:07:07 +02:00
Igor Kulikov
d2654c93f4 Separate application artifact from spring boot jar 2016-12-14 17:00:36 +02:00
Andrew Shvayka
a4ae4162a3 Merge pull request #10 from ytalashko/master
Remove redundant conversions into streams
2016-12-11 09:55:54 +02:00
Andrew Shvayka
92da11aa58 Version set to 1.0.1-SNAPSHOT 2016-12-08 14:39:35 +02:00
ytalashko
9b18b2a863 Clean up shared package 2016-12-08 00:53:01 +02:00
ytalashko
75d1ad3f71 Merge branch 'master' of github.com:thingsboard/thingsboard 2016-12-07 23:25:50 +02:00
ytalashko
9ac9761780 Remove redundant conversions into streams 2016-12-07 17:19:04 +02:00
Igor Kulikov
f248126447 Add gitter chat icon 2016-12-06 18:28:50 +02:00
Andrew Shvayka
872d103222 Merge pull request #8 from thingsboard/feature/travis-build
Feature/travis build
2016-12-06 17:53:46 +02:00
Igor Kulikov
0bda42a573 Add travis status image 2016-12-06 17:52:24 +02:00
Igor Kulikov
9352c40935 Remove redudant java option 2016-12-06 17:47:05 +02:00
Igor Kulikov
5a32cb04f0 Improve maven opts 2016-12-06 16:56:02 +02:00
Igor Kulikov
302c9a798f Improve maven opts 2016-12-06 16:54:06 +02:00
Andrew Shvayka
308531e54b Increase of timeout to pass test on Travis 2016-12-06 14:50:15 +02:00
Andrew Shvayka
2d840e77eb Reduced log level for tests to pass Travis build 2016-12-06 14:15:27 +02:00
Andrew Shvayka
20076b49a3 Travis Build 2016-12-06 14:03:37 +02:00
Andrew Shvayka
2d8d6c5e04 Merge branch 'master' of github.com:thingsboard/thingsboard 2016-12-06 14:00:29 +02:00
Andrew Shvayka
f2d4a1adb1 Travis build 2016-12-06 14:00:18 +02:00