3798 Commits

Author SHA1 Message Date
Artem Halushko
4aa10db7a3 Merge branch 'map/3.0' of https://github.com/ArtemHalushko/thingsboard into map/3.0 2020-05-21 18:48:32 +03:00
Artem Halushko
690784c0e6 trip animation update fix 2020-05-21 18:43:25 +03:00
Vladyslav_Prykhodko
0408dd16d3 Clear code 2020-05-21 17:28:57 +03:00
VoBa
5e40f16d54
Merge pull request #2811 from volodymyr-babak/develop/2.5.1
Changed default processing timeout
2020-05-21 17:27:27 +03:00
Volodymyr Babak
d610c115d3 Changed default processing timeout 2020-05-21 17:26:45 +03:00
Igor Kulikov
a70a4b724b Fix black-box tests 2020-05-21 17:14:59 +03:00
Vladyslav_Prykhodko
f0be7b8b97 Fix calculate tooltip 2020-05-21 16:46:25 +03:00
Andrii Shvaika
68151e6561 Refactored DEB/RPM builds for Java-based components 2020-05-21 15:43:01 +03:00
Vladyslav_Prykhodko
59d2fdc79e Improvements calculate data 2020-05-21 15:02:58 +03:00
Artem Halushko
a001121d61 Merge branch 'master' of https://github.com/thingsboard/thingsboard into map/3.0 2020-05-21 14:23:37 +03:00
Artem Halushko
20f316cec0 fix map type caching 2020-05-21 14:23:23 +03:00
Andrii Shvaika
3ea881f03b Stage 1 refactoring 2020-05-21 11:51:51 +03:00
Igor Kulikov
78d054797e
Merge pull request #2806 from vzikratyi-tb/oauth2-default-dashboard
Oauth2 default dashboard
2020-05-21 10:53:40 +03:00
viktor
4ed334a5d5 Merge branch 'develop/2.5.1' into oauth2-default-dashboard 2020-05-21 10:26:32 +03:00
Igor Kulikov
dcd00e587a Merge branch 'master' of github.com:thingsboard/thingsboard 2020-05-20 19:43:25 +03:00
Igor Kulikov
6131000c8c Direct access of core services from widget context. JavaScript editors code autocompletion and tooltips. 2020-05-20 19:42:58 +03:00
viktor
cd66290ba5 Check and set default dashboard in OAuth2Mapper 2020-05-20 18:28:25 +03:00
viktor
cac7eb0d2b Added 'alwaysFullScreen' and 'defaultDashboardName' oauth2 properties 2020-05-20 18:27:26 +03:00
Andrii Shvaika
676868b4d3 Fix for Transport API subscriptions 2020-05-20 15:37:06 +03:00
Artem Halushko
889e55104a Merge branch 'master' of https://github.com/thingsboard/thingsboard into map/3.0 2020-05-20 13:27:33 +03:00
Artem Halushko
69f41be576 interpolation fix 2020-05-20 13:22:08 +03:00
Igor Kulikov
13e6b10b7a
Merge pull request #2802 from vvlladd28/improvement/style
Update style
2020-05-20 09:58:24 +03:00
Igor Kulikov
b990349c8b
Merge pull request #2799 from ArtemHalushko/trip-select
Trip select
2020-05-20 09:57:34 +03:00
Vladyslav_Prykhodko
29372983b1 Update style 2020-05-20 09:52:07 +03:00
Igor Kulikov
1702ba5536 Fix compilation 2020-05-19 20:28:14 +03:00
Igor Kulikov
135aa8ddb9 Fix migration script 2020-05-19 15:56:51 +03:00
Artem Halushko
aac5b0e77c utility fixes 2020-05-19 15:20:56 +03:00
Artem Halushko
3733a1d24e clear ui folder 2020-05-19 15:15:04 +03:00
Artem Halushko
041ef624a2 Merge branch 'master' of https://github.com/thingsboard/thingsboard into trip-select 2020-05-19 15:04:48 +03:00
Artem Halushko
e5e2c3f5bb selected trip on map 2020-05-19 14:59:25 +03:00
Igor Kulikov
22e5da1c02
Merge pull request #2795 from vvlladd28/update/lib
Update dependencies
2020-05-19 12:36:46 +03:00
Igor Kulikov
56a7cb6905 Update rule nodes ui 2020-05-19 12:35:14 +03:00
Artem Halushko
f8af340464 pulled with master 2020-05-19 11:43:42 +03:00
Artem Halushko
8808d66c9d Merge branch 'master' of https://github.com/ArtemHalushko/thingsboard into trip-select 2020-05-19 11:43:00 +03:00
Artem Halushko
0ee3f77d9e zoom fix 2020-05-19 11:02:36 +03:00
Igor Kulikov
56fb09b9f1 Improve custom dialog container 2020-05-19 10:49:10 +03:00
Igor Kulikov
6f065804a5
Merge pull request #2792 from vvlladd28/improvement/map/anchor-point
Improvment anchor function and fix show point [trip-animation]
2020-05-19 10:33:02 +03:00
Vladyslav_Prykhodko
7d7be4199c Update dependencies 2020-05-19 10:27:52 +03:00
Vladyslav_Prykhodko
c639e9c3b8 Refactoring 2020-05-18 22:39:06 +03:00
Vladyslav_Prykhodko
8117d06994 Add anchor function and fix show point [trip-animation] 2020-05-18 21:55:28 +03:00
Igor Kulikov
394ec3df22
Merge pull request #2787 from vvlladd28/improvement/3.0/polyline
Refactoring ui polilyne
2020-05-18 16:04:48 +03:00
Igor Kulikov
cf593601b9 Sync multi-page guava cassandra session support 2020-05-18 16:03:51 +03:00
Vladyslav_Prykhodko
03df7ac58b Refactoring and added type 2020-05-18 15:47:13 +03:00
Andrii Shvaika
d6ea7c30be Merge fixes from 2.5.1 2020-05-18 14:19:11 +03:00
Andrii Shvaika
acf900e1de Fix for claim devices and shared/client attribute updates over WS 2020-05-18 13:04:07 +03:00
Igor Kulikov
872e9f528c Remove duplicate snakeyaml dependency entry 2020-05-18 11:35:55 +03:00
Igor Kulikov
ae93e3d3a2
Merge pull request #2775 from JavierNR/feature/spanish-translations
Add gateway spanish translations, spanish semantic improvements
2020-05-18 11:09:14 +03:00
Igor Kulikov
5c667ba7fe
Merge pull request #2785 from vvlladd28/improvement/3.0/trip-animation
Improvement trip animation
2020-05-18 11:08:33 +03:00
Vladyslav_Prykhodko
a1b84834fc Update trip-animation widget 2020-05-18 10:58:46 +03:00
Igor Kulikov
2eeb11c781
Merge pull request #2778 from volodymyr-babak/fix-for-equals
Use equals instead of ==
2020-05-15 19:36:44 +03:00