4485 Commits

Author SHA1 Message Date
Igor Kulikov
c460208b9c Minor upgrade fixes 2020-09-04 14:11:05 +03:00
Igor Kulikov
6d34e91c1b Restore tests 2020-09-04 14:05:44 +03:00
Andrii Shvaika
e67946e47f Upgrade script implementation 2020-09-04 12:53:22 +03:00
Andrii Shvaika
51966f0094 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-03 19:05:24 +03:00
Andrii Shvaika
b9b82446eb Transport Type check 2020-09-03 19:05:14 +03:00
Igor Kulikov
f5f531e716 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-03 18:54:20 +03:00
Igor Kulikov
d8ae8282a0 Forbid change of device profile type or transport type when used by devices. 2020-09-03 18:54:08 +03:00
Andrii Shvaika
d440d500e5 Mqtt Transport Configuration 2020-09-03 18:38:11 +03:00
Andrii Shvaika
5cad682092 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-03 18:21:02 +03:00
Andrii Shvaika
01ec9f048d Transport Refactoring to fetch Device Profile with Credentials 2020-09-03 18:20:49 +03:00
Igor Kulikov
06573211b3 UI: Improve device profile/data 2020-09-03 17:43:53 +03:00
Igor Kulikov
1e87c72818 UI: Device profile autocomplete. Device profile data. 2020-09-03 14:14:46 +03:00
Igor Kulikov
3adbb481a1 UI: Device profile transport configuration 2020-09-03 12:51:54 +03:00
Igor Kulikov
0759c135a3 Create default profile transport configuration 2020-09-03 12:06:02 +03:00
Igor Kulikov
484382ba02 Fix tests 2020-09-03 11:54:56 +03:00
Igor Kulikov
13b7fa3aa0 Use Json Binary type for tenant/device profiles data 2020-09-03 11:52:25 +03:00
Igor Kulikov
600f564ce8 Merge branch 'develop/3.2' of github.com:thingsboard/thingsboard into develop/3.2 2020-09-03 10:04:16 +03:00
Igor Kulikov
6f030fa8da UI: Tenant/Device profile data 2020-09-03 10:04:03 +03:00
Andrii Shvaika
df823c8f90 Merge with UI changes 2020-09-02 19:10:46 +03:00
Andrii Shvaika
22755e8763 Device Profile implementation for Transport 2020-09-02 18:52:59 +03:00
Igor Kulikov
cc018f8876 UI: Device profiles 2020-09-02 18:32:57 +03:00
Igor Kulikov
73a988b541 Add tenant profile data 2020-09-02 12:19:35 +03:00
Igor Kulikov
cf4e1a4bd9 UI: Inline tenant profile create/edit. 2020-09-01 18:41:42 +03:00
Igor Kulikov
a73e6be523 Merge branch 'master' into develop/3.2 2020-09-01 15:16:38 +03:00
Igor Kulikov
39f0d92e15 Merge branch 'develop/2.5.5' 2020-09-01 15:16:20 +03:00
Igor Kulikov
73a951c58f
Merge pull request #3403 from YevhenBondarenko/develop/2.5.5-improvements
add request param "orderBy" for getTimeseries
2020-09-01 15:12:37 +03:00
YevhenBondarenko
bc2520fbbb add request param "orderBy" for getTimeseries 2020-09-01 14:58:11 +03:00
Igor Kulikov
8c98f271fa Merge branch 'master' into develop/3.2 2020-09-01 14:56:03 +03:00
Igor Kulikov
7e55fd138d Restore version 3.1.1-SNAPSHOT 2020-09-01 14:55:41 +03:00
Igor Kulikov
088ab976a1 Merge with develop/2.5.5 2020-09-01 14:54:58 +03:00
Igor Kulikov
f2822b2c3e Temporarily version set to 2.5.5-SNAPSHOT 2020-09-01 14:53:30 +03:00
Igor Kulikov
4753f2da6f
Merge pull request #3398 from vvlladd28/improvement/ctx/add-import-router
Added widget context import Router module
2020-09-01 14:51:35 +03:00
Igor Kulikov
2db7dedcc6
Merge pull request #3395 from vvlladd28/improvement/gauge/minor-fix
Fixed show ticks and start donut angle for gauge
2020-09-01 14:51:13 +03:00
Igor Kulikov
03fbc46654
Merge pull request #3383 from YevhenBondarenko/queue/improvements
in memory queue logs
2020-09-01 14:42:35 +03:00
Igor Kulikov
16f088ecf9 Merge with master 2020-09-01 14:40:28 +03:00
Vladyslav_Prykhodko
7349108111 Fixed not correct label text for weight font; Refactoring 2020-08-31 17:34:06 +03:00
Vladyslav_Prykhodko
ff892300d0 Add services completion 2020-08-31 16:54:07 +03:00
YevhenBondarenko
fe27cb1a31 fix NPE in findAlarms from JpaAlarmDao
(cherry picked from commit 2c1fd8e0436d4b4ae12cd385114c2ae890923c5e)
2020-08-31 16:46:44 +03:00
Vladyslav_Prykhodko
01a5488032 Added widget context Router 2020-08-31 16:39:54 +03:00
vzikratyi
8e8c1ae860 Removed resending of PUBREC msgs 2020-08-31 15:44:11 +03:00
Vladyslav_Prykhodko
c4fd3cb5ac Fixed show ticks and start donut angle for gauge; Refactoring 2020-08-31 13:42:33 +03:00
YevhenBondarenko
4df660fe03 added maven-source-plugin 2020-08-31 12:39:41 +03:00
Andrii Shvaika
8ec23f22d4 Version set 2.5.5-SNAPSHOT 2020-08-28 19:02:31 +03:00
YevhenBondarenko
e5ad5e0b30 refactored 2020-08-28 17:36:57 +03:00
YevhenBondarenko
18ca330c9e in memory queue logs 2020-08-28 17:02:04 +03:00
yusufc
4af92b2537 - Default originator type is reverted. 2020-08-28 16:57:05 +03:00
yusufc
4b13647556 - Alarm option is added to switch nodes in rule engine. 2020-08-28 16:57:05 +03:00
Igor Kulikov
0f0a25ce38 Merge branch 'develop/2.5.4' 2020-08-28 16:04:23 +03:00
Igor Kulikov
8ebaa22ae2
Merge pull request #3381 from YevhenBondarenko/queue/improvements
added logs for in memory queue
2020-08-28 16:03:33 +03:00
YevhenBondarenko
17ee07e09a changed log time 2020-08-28 16:01:43 +03:00