5882 Commits

Author SHA1 Message Date
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
vzikratyi
2cd5b646e3 Fixed merge 2020-08-31 10:43:15 +03:00
vzikratyi
faf0184cff Merge remote-tracking branch 'upstream/master' into feature/dynamic-oauth2-new-table
# Conflicts:
#	application/src/main/data/upgrade/3.1.0/schema_update.sql
2020-08-31 10:27:39 +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
Volodymyr Babak
1de29d7b51 Remove unused code 2020-08-28 15:27:43 +03:00
YevhenBondarenko
3794086726 added logs for in memory queue 2020-08-28 15:24:31 +03:00
Volodymyr Babak
c991ab96f1 Merge branch 'feature/edge' of github.com:volodymyr-babak/thingsboard into feature/edge 2020-08-28 14:25:05 +03:00
Volodymyr Babak
9c8ceaa37e Properly handle entities assign/unassign to/from customer 2020-08-28 14:14:07 +03:00
Igor Kulikov
967766359f js-executor and web-ui: Update dependencies, switch to yarn. 2020-08-28 12:59:19 +03:00
Igor Kulikov
74e016e897 Modules map fix 2020-08-27 20:13:19 +03:00
Igor Kulikov
8b6c8ae531
Merge pull request #3380 from vvlladd28/improvement/modules-map
Updated modules map
2020-08-27 19:37:06 +03:00
Igor Kulikov
3930e923ef
Merge pull request #3378 from vvlladd28/bugs/state/clear
Fixed clear state params for change dashboardId
2020-08-27 19:33:14 +03:00
Igor Kulikov
f39d663827 UI: Tenant Profiles 2020-08-27 19:32:15 +03:00
Vladyslav_Prykhodko
355ed1ef23 Updated modules map 2020-08-27 19:08:31 +03:00
vzikratyi
118729221c Moved convertResultToTsKvEntry to base class and updated it 2020-08-27 17:43:28 +03:00
ShvaykaD
e33709d830
fix/getAttributesRequest & fix/hsql-inserts-with-json (#3376)
* fix GetAttributeRequest & Hsql inserts

* added deleted keys to GetAttributeResponseMsg for gateway

* changed logic for handleGetAttributesRequest on deleted attributes

* removed unused classes and remove deleted keys in GetAttributeResponseMsg proto

* revert yml file

* removed getDeletedAttributeKeysCount method call in Coap transport
2020-08-27 17:11:00 +03:00
Vladyslav_Prykhodko
bdd4c30fc0 Fixed clear state params for change dashboardId 2020-08-27 17:01:47 +03:00
VoBa
82e4968d90
Merge pull request #42 from deaflynx/feature/edge
Added manage customer edges
2020-08-27 11:11:43 +03:00
deaflynx
aeaf2ed6c6 Added manage customer edges 2020-08-27 11:05:13 +03:00
VoBa
cf5f1cffda
Merge pull request #41 from deaflynx/feature/edge
Fix for fetch edge rule chains and deleted unused code
2020-08-27 10:17:44 +03:00
deaflynx
4ac8c0675b Fixed fetch edge rule chains 2020-08-27 08:46:32 +03:00
deaflynx
5d8378290a Merge branch 'feature/edge' of github.com:volodymyr-babak/thingsboard into feature/edge 2020-08-27 07:05:02 +03:00
Igor Kulikov
85b31df44d Merge branch 'master' into develop/3.2 2020-08-26 19:21:27 +03:00
Igor Kulikov
541091a221 Minor fixes 2020-08-26 19:20:58 +03:00
Igor Kulikov
0a53e2ff97
Merge pull request #3370 from vvlladd28/improvmnet/minnor-fix
Fixed unclean state when changing the dashboard
2020-08-26 18:44:40 +03:00
Igor Kulikov
38847216cd Merge branch 'master' into develop/3.2 2020-08-26 16:08:45 +03:00
Igor Kulikov
e5e103be98 Improve toast panel 2020-08-26 15:04:26 +03:00
Igor Kulikov
868234f13d Tenant, device profiles UI 2020-08-26 15:00:11 +03:00
Vladyslav_Prykhodko
bdaea076f5 Fixed unclean state when changing the dashboard 2020-08-26 12:49:37 +03:00
Igor Kulikov
d166be02ca
Merge pull request #3366 from ChantsovaEkaterina/improvement/service-completion
Improvement/service completion - services arguments and descriptions correction
2020-08-26 09:54:46 +03:00
Chantsova Ekaterina
f7b867a10c Correct services arguments 2020-08-25 19:47:43 +03:00
VoBa
bdac3e3f39
Merge pull request #40 from BohdanSmetanyuk/bug/input_node_connection
fixed bug with connection to first node
2020-08-25 19:32:45 +03:00
Bohdan Smetaniuk
883f8fff4c fixed bug with connection to first node 2020-08-25 19:23:49 +03:00
Chantsova Ekaterina
156f7d6ae7 Correct mistakes in descriptions 2020-08-25 17:16:09 +03:00
VoBa
2be3d9209f
Merge pull request #39 from BohdanSmetanyuk/code_fixes
code fixes
2020-08-25 14:33:00 +03:00
Bohdan Smetaniuk
67fc2f5a19 added logs 2020-08-25 14:22:58 +03:00
Bohdan Smetaniuk
1d5f5c5d80 code fixes 2020-08-25 14:04:47 +03:00