dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,166 Commits 106 Branches 71 Tags
Commit Graph

4166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Igor Kulikov
a4580e7708 Update package-lock v2.5 2020-05-12 10:41:53 +03:00
Igor Kulikov
fa5bbcd91b Version set to 2.5.0 2020-05-12 10:28:15 +03:00
ShvaykaD
b9bc280d57
Fix typo in upgrade logs (#2757) 
* update psql & timescale update

* fix windows upgrade

* fix typo in logging
 2020-05-11 11:47:17 +03:00
Andrii Shvaika
45af758f46 Merge branch 'volodymyr-babak-feature/stateful-services' 2020-05-11 11:24:08 +03:00
Andrii Shvaika
888329436b Fixed License Headers 2020-05-11 11:23:55 +03:00
Andrii Shvaika
e31bc3d3b3 Merge branch 'feature/stateful-services' of https://github.com/volodymyr-babak/thingsboard into volodymyr-babak-feature/stateful-services 2020-05-11 11:22:19 +03:00
ShvaykaD
8d0d23e620
psql & timescale upgrade (#2748) 
* update psql & timescale update

* fix windows upgrade
 2020-05-11 11:19:01 +03:00
YevhenBondarenko
bedc624e09 change tb-js-executor scale in docker-compose.yml 2020-05-11 11:15:09 +03:00
YevhenBondarenko
95ddde3e38 added docker-compose and environment for queues 2020-05-11 11:15:09 +03:00
Igor Kulikov
2d235cf9eb Improve Cassandra resultSet pagination 2020-05-08 19:34:08 +03:00
Volodymyr Babak
c0fde32a43 Revert changes 2020-05-08 16:55:05 +03:00
Volodymyr Babak
4fd263d3ea moved thirdparty services to a separate file 2020-05-08 16:51:15 +03:00
Volodymyr Babak
0d0cdb8d9a Revert versions 2020-05-08 16:43:28 +03:00
Volodymyr Babak
ef21d2ae41 Merge remote-tracking branch 'upstream/master' into feature/stateful-services 2020-05-08 16:41:55 +03:00
Igor Kulikov
34da0fe811 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-08 16:25:14 +03:00
VoBa
7e66fd2693
Fix for pem key with password (#2752) 
* Added activate user config. Fixed https issue

* Added possibility to encode PEM files encrypted with a private key - Integration

* Remove PE fixes
 2020-05-08 16:11:59 +03:00
Vladyslav
7f53d53163
[3.0] Fixed polygon functionality (#2747) 
* Add default setting and title for group

* Fix polygon: updateColor, functions tooltip and color polygon, update coordinate polygon

* Improvement code

* Refactoring code
 2020-05-08 15:50:13 +03:00
Igor Kulikov
76300e400e Update Cassandra Driver 2020-05-08 15:45:54 +03:00
Yevhen Bondarenko
424d631a69
added extra properties to kafka consumer (#2751) 
* added extra properties to kafka consumer

* added default values for kafka consumer properties in TbKafkaSettings

* Update TbKafkaSettings.java

* Update thingsboard.yml

Co-authored-by: Andrew Shvayka <ashvayka@thingsboard.io>
 2020-05-08 14:38:04 +03:00
Igor Kulikov
b81370b6a0 Merge branch 'master' into develop/3.0 2020-05-07 14:21:35 +03:00
Igor Kulikov
f2757e0535 Use source ip load balancing algorithm for http requests 2020-05-07 14:21:17 +03:00
Igor Kulikov
4659ab7dd0 Improve table widgets mobile mode 2020-05-07 13:07:11 +03:00
Igor Kulikov
e3e037c93e Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-07 12:46:43 +03:00
Igor Kulikov
0e45e45f55 Fix typo 2020-05-07 12:42:27 +03:00
ArtemHalushko
416d045893
Map/3.0 (#2738) 
* WIP on trip-animation settings

* trip-animation points & anchors

* fixes

Co-authored-by: Adsumus <artemtv42@gmail.com>
Co-authored-by: Igor Kulikov <ikulikov@thingsboard.io>
 2020-05-07 12:25:43 +03:00
Igor Kulikov
3280df3b9c
Merge branch 'develop/3.0' into map/3.0 2020-05-07 12:25:31 +03:00
Artem Halushko
9e860a3bf8 fixes 2020-05-07 11:37:07 +03:00
Vladyslav
7a87e6c16d
Fix error update websocket to change user (#2744) 2020-05-07 11:27:29 +03:00
Igor Kulikov
9db9c36bb3 Fix tests 2020-05-07 11:23:36 +03:00
Vladyslav
15452dfe15
Fix error update websocket to change user (#2743) 2020-05-07 11:19:27 +03:00
Igor Kulikov
bf258a94a3 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.0 2020-05-07 11:10:21 +03:00
Vladyslav
65015bfd73
[3.0] Improvement image map (#2740) 
* Fixed not correct center image map
Fixed update position marker for image map

* Add support IE and clear code

* Fix not correct update image for datasource

* Update marker position
 2020-05-07 11:09:56 +03:00
Igor Kulikov
e8ee8cb6d2 Fix tests 2020-05-07 11:09:12 +03:00
Andrii Shvaika
864a98fd8b Merge branch 'master' of github.com:thingsboard/thingsboard 2020-05-07 10:49:57 +03:00
Andrii Shvaika
71f94358c4 Fix typos and added break statement 2020-05-07 10:49:44 +03:00
Artem Halushko
9ad09bb5ac Merge branch 'develop/3.0' of https://github.com/thingsboard/thingsboard into map/3.0 2020-05-07 10:29:47 +03:00
Igor Kulikov
e9553b627b Introduce OAuth failure handling 2020-05-06 20:30:02 +03:00
Igor Kulikov
0ce5222072 Merge branch 'master' into develop/3.0 2020-05-06 20:04:33 +03:00
Igor Kulikov
d9bfd82926 Introduce OAuth failure handling 2020-05-06 20:04:09 +03:00
VoBa
9b18c408b2
Added activate user config. Fixed https issue (#2737) 
* Added activate user config. Fixed https issue

* Update OAuth2User.java

Co-authored-by: Igor Kulikov <ikulikov82@gmail.com>
 2020-05-06 19:20:18 +03:00
Artem Halushko
4890125423 trip-animation points & anchors 2020-05-06 19:09:41 +03:00
Igor Kulikov
f29c9c9452 Improve OAuth button style 2020-05-06 16:22:18 +03:00
Igor Kulikov
ab27084e7e Improve OAuth button style 2020-05-06 15:43:08 +03:00
Igor Kulikov
aabbe7735d Update haproxy.cfg with oauth rules 2020-05-06 14:37:30 +03:00
Igor Kulikov
d8c201a7fe OAuth button style improvement 2020-05-06 14:36:08 +03:00
Igor Kulikov
ced25c51c4 Improve OAuth buttons style 2020-05-06 12:44:47 +03:00
Igor Kulikov
c6bd82ddaa Merge branch 'master' into develop/3.0 2020-05-06 12:30:01 +03:00
Igor Kulikov
c83d600bdd Merge branch 'master' of github.com:thingsboard/thingsboard 2020-05-06 12:29:41 +03:00
Igor Kulikov
175a9c903d OAuth: activate user with empty password - to be able to set up it later 2020-05-06 12:29:26 +03:00
Andrew Shvayka
b49a7f573b
Merge pull request #2736 from volodymyr-babak/bug/relation-concurrent-fix 
Changed direct executors to db executors
 2020-05-06 12:21:02 +03:00