4006 Commits

Author SHA1 Message Date
Andrii Shvaika
a532ded5ae Version set to 2.5.2-SNAPSHOT 2020-06-01 16:11:57 +03:00
Igor Kulikov
9e94611004 Improve mail server settings 2020-06-01 15:22:42 +03:00
Igor Kulikov
a054be36ac Merge with develop/2.5.1 2020-06-01 14:53:39 +03:00
Igor Kulikov
2b8533e908
Merge pull request #2893 from YevhenBondarenko/feature/ui-proxy
Feature/ui proxy
2020-06-01 14:52:00 +03:00
YevhenBondarenko
a810933982 send email rule node and mail server improvements 2020-06-01 14:44:24 +03:00
YevhenBondarenko
1f065f99c9 added ui for send email rule node and refactored mail server 2020-06-01 14:05:01 +03:00
Igor Kulikov
15c65dc16a
Merge pull request #2888 from YevhenBondarenko/feature/ui-proxy
[WIP]mail proxy ui
2020-06-01 12:36:11 +03:00
Andrew Shvayka
55d2e611f6
Merge pull request #2890 from vvlladd28/improvement/mail-settings
Improvment view mail-setting
2020-06-01 12:33:06 +03:00
Vladyslav_Prykhodko
a99d5d9fc2 Improvment view mail-setting 2020-06-01 11:50:25 +03:00
YevhenBondarenko
6066a6bf04 refactored mail-server 2020-06-01 10:54:54 +03:00
YevhenBondarenko
3c13b84ef4 added proxy ui for mail-server 2020-06-01 01:34:26 +03:00
Igor Kulikov
81851db5c0 Alias: Batch support for fetching entities from relations 2020-05-29 16:31:15 +03:00
Igor Kulikov
fe36f91890 Alias: Batch support for fetching entities from relations 2020-05-29 15:06:03 +03:00
Igor Kulikov
887188fe1a Update package-lock and k8s readme 2020-05-29 12:03:27 +03:00
Igor Kulikov
d2fb4308fa Merge with develop/2.5.1 2020-05-29 11:37:28 +03:00
Igor Kulikov
3a303ccdb3 Update package-lock 2020-05-29 11:22:35 +03:00
Igor Kulikov
6c19857c99 Update package versions 2020-05-29 11:18:50 +03:00
VoBa
edb9ef7a3f
Merge pull request #2839 from vzikratyi-tb/fix-yml-config
Refactored k8s configs (made 'basic' and 'high-availability' deployment modes)
2020-05-29 10:38:27 +03:00
Igor Kulikov
51a2fb89cd
Merge pull request #2874 from vvlladd28/bug/trip-animation
Bug/trip animation
2020-05-29 10:12:01 +03:00
Vladyslav_Prykhodko
7985fb31f0 Fix resize trip-animation widget and calculate dsIndex 2020-05-28 22:07:43 +03:00
Vladyslav_Prykhodko
7fee32c2f3 Merge remote-tracking branch 'upstream/master' 2020-05-28 22:05:31 +03:00
Igor Kulikov
23dbec0b8d
Merge pull request #2871 from ArtemHalushko/map/3.0
some typing
2020-05-28 19:13:29 +03:00
Vladyslav_Prykhodko
a955df3923 Merge branch 'map/3.0' of https://github.com/ArtemHalushko/thingsboard 2020-05-28 18:58:03 +03:00
Igor Kulikov
f2a57fd6a7 Merge branch 'develop/2.5.1' 2020-05-28 18:19:11 +03:00
Andrii Shvaika
37b9311be9 Empty partitions 2020-05-28 18:17:20 +03:00
Igor Kulikov
0df5a536b0 Merge branch 'develop/2.5.1' 2020-05-28 18:04:52 +03:00
Andrii Shvaika
2407c868c1 Cluster mode improvements 2020-05-28 17:40:26 +03:00
Igor Kulikov
5179cef3d8 Merge branch 'develop/2.5.1' 2020-05-28 16:45:25 +03:00
Andrew Shvayka
202547bf98
Merge pull request #2866 from volodymyr-babak/fix-for-error-msg
Updated to more generic error message in case of error
2020-05-28 12:34:17 +03:00
Volodymyr Babak
2c08c585a2 Updated to more generic error message in case of error 2020-05-28 12:29:54 +03:00
Igor Kulikov
e8d0e50571
Merge pull request #2865 from vvlladd28/bug/entity-relation
[3.0] Fix get enity relation infoes for empty array
2020-05-27 21:36:55 +03:00
Vladyslav_Prykhodko
11207c7550 Fix get enity relation infoes for empty array 2020-05-27 20:25:12 +03:00
viktor
49b3df7de3 Added to README command to delete thirdparty-resources 2020-05-27 17:17:45 +03:00
viktor
8ab77d2fd8 Fixed README.md 2020-05-27 17:08:11 +03:00
viktor
c2648a64d4 Fixed README.md 2020-05-27 16:59:31 +03:00
Igor Kulikov
60a601d736 Merge branch 'develop/2.5.1' 2020-05-27 16:13:51 +03:00
Igor Kulikov
0ef991c46b Add checkEntity for dashboard 2020-05-27 16:13:23 +03:00
viktor
6c72912a36 Returned 20 js-executors as default 2020-05-27 15:44:39 +03:00
viktor
7c72233387 Added commands for creating Redis cluster in k8s-deploy-thirdparty.sh 2020-05-27 15:40:57 +03:00
viktor
53b240a72b Fixed k8s-upgrade-tb.sh 2020-05-27 15:22:48 +03:00
viktor
18193a697e Refactored k8s configs (made 'basic' and 'high-availability' deployment modes) 2020-05-27 15:20:30 +03:00
Igor Kulikov
0f821815bc Merge with develop/2.5.1 2020-05-27 14:17:36 +03:00
Igor Kulikov
65fb9a91ec Merge with develop/2.5.1 2020-05-27 14:11:06 +03:00
Igor Kulikov
f52c1b0f9b
Merge pull request #2812 from YevhenBondarenko/develop/2.5.1
[2.5.1] controllers improvements
2020-05-27 14:09:57 +03:00
Andrew Shvayka
bd40edfd14
Merge pull request #2830 from ShvaykaD/develop/2.5.1
added inserts strategy for upgrade to 2.5 if copy to/from files failed
2020-05-27 13:17:17 +03:00
YevhenBondarenko
587bd387b8 Merge branch 'develop/2.5.1' of https://github.com/thingsboard/thingsboard into develop/2.5.1 2020-05-27 12:22:32 +03:00
Artem Halushko
9c85b76069 some typing 2020-05-27 11:08:06 +03:00
Igor Kulikov
2d7d83f013 Merge branch 'develop/2.5.1' 2020-05-27 10:08:03 +03:00
Igor Kulikov
feba4b040d
Merge pull request #2844 from volodymyr-babak/fix-for-custom-mapper-error-handler
Proper handle error cases in OAuth 2 success handler
2020-05-27 10:06:56 +03:00
Volodymyr Babak
1b1fedf1d0 Proper handle error cases in OAuth 2 success handler 2020-05-27 09:37:16 +03:00