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

5403 Commits

Author SHA1 Message Date
ViacheslavKlimov
ce83ee4444 Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits 
# Conflicts:
#	application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
 2023-05-17 12:28:51 +03:00
ViacheslavKlimov
2483c89055 Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits 2023-05-17 12:28:24 +03:00
Igor Kulikov
7058f99068 Version set to 3.5.1-SNAPSHOT 2023-05-12 15:45:11 +03:00
Igor Kulikov
0beb2d7033 Merge branch 'master' into develop/3.5.1 2023-05-12 15:43:22 +03:00
Andrii Shvaika
c8d28ed672 No snapshot versions for edge 2023-05-10 14:41:34 +03:00
Igor Kulikov
f09fc8e735 Update ui help url 2023-05-09 11:20:01 +03:00
Andrii Shvaika
43674b7f29 Ignore a flaky test that is based on wrong cache strategy 2023-05-08 18:45:56 +03:00
Andrew Shvayka
1a366d476e
Revert "[3.5.1]Replace object mapper usages with jackson utils" 2023-05-08 14:54:21 +03:00
YevhenBondarenko
f1876456ca moved views and functions to a separate file 2023-05-08 13:47:57 +02:00
AndriiD
15d8b8ce91 Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil 2023-05-08 13:07:32 +03:00
ViacheslavKlimov
ead9d3be70 Merge with develop/3.5.1 2023-05-08 12:54:07 +03:00
Andrew Shvayka
1a4eb3cf64
Merge pull request #8487 from YevhenBondarenko/fix/singleton-node 
fixed singleton mode update
 2023-05-08 12:17:12 +03:00
YevhenBondarenko
d3bc69f652 fixed singleton mode update 2023-05-04 16:56:56 +02:00
AndriiD
93c219c83e renamed base controller/service tests 2023-05-04 16:43:13 +03:00
Andrii Landiak
cc7564f137 Fix java cacerts path file separator for thingsboard.yml config 2023-05-04 16:16:55 +03:00
AndriiD
32e5d8561b Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
#	dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
#	rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
#	rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
 2023-05-04 14:35:41 +03:00
Andrew Shvayka
86743b907a
Merge pull request #8464 from thingsboard/improvements/notification-system 
Notifications deduplication; upgrade improvements
 2023-05-04 12:47:03 +03:00
AndriiD
0e84fc1c6a removed redundant tests 2023-05-04 12:35:53 +03:00
ViacheslavKlimov
6c8f3c19de Active devices count to debug 2023-05-03 16:32:33 +03:00
ViacheslavKlimov
36743eb5af Branch name validation 2023-05-03 16:31:31 +03:00
Andrii Shvaika
9d217608b2 Merge branch 'fix/devices-activity-stats' 2023-05-03 15:22:04 +03:00
Andrii Shvaika
c87b993262 Change default parameters for active device counts 2023-05-03 14:25:53 +03:00
Andrii Shvaika
08835a7245 Improvements to the activity stats reporting 2023-05-03 14:23:54 +03:00
ViacheslavKlimov
5f7ff55f01 Performance improvements for usage stats 2023-05-03 13:11:09 +03:00
YevhenBondarenko
0ae1be3aa5 kv validator improvements 2023-05-03 11:44:59 +02:00
Andrew Shvayka
ccd9af264c
Merge pull request #8463 from YevhenBondarenko/import-improvements 
optimize imports
 2023-05-02 17:33:11 +03:00
Andrew Shvayka
15ce59b64f
Merge pull request #8449 from YevhenBondarenko/fix/device-state 
fixed using default timeout and improvements
 2023-05-02 13:28:41 +03:00
ViacheslavKlimov
c39e8568ae Upgrade improvements for notification system 2023-05-02 12:46:50 +03:00
YevhenBondarenko
fbf9773a61 optimize imports 2023-05-02 10:57:58 +02:00
ViacheslavKlimov
a4281fd6d3 Deduplication for new platform version notification 2023-05-01 19:28:11 +03:00
Andrii Shvaika
a87561daa3 Fix typo 2023-05-01 17:18:02 +03:00
Andrii Shvaika
f92ff4237b Fix inline doc in the home page widgets 2023-05-01 17:12:45 +03:00
Igor Kulikov
96cfb384ed
Merge pull request #8448 from vvlladd28/improvement/home-page-widget/new-description 
Updated in home page widgets bundle description and image
 2023-05-01 16:41:51 +03:00
Igor Kulikov
44cf98de0e Merge branch 'master' of github.com:thingsboard/thingsboard 2023-05-01 15:42:06 +03:00
Igor Kulikov
1f334d58ad Introduce SystemParams object holding necessary UI system parameters 2023-05-01 15:41:55 +03:00
Andrii Shvaika
df0bd28ae5 Fix Sparkplug tests 2023-05-01 13:37:17 +03:00
Andrew Shvayka
d03f236263
Merge pull request #8440 from thingsboard/improvements/notification-system 
Improvements for notification system
 2023-05-01 12:43:48 +03:00
Andrew Shvayka
cbb3575e4a
Merge pull request #8455 from thingsboard/feature/device-info-filter 
Feature/device info filter
 2023-05-01 12:22:45 +03:00
Andrew Shvayka
17f084ec57
Merge pull request #8444 from dashevchenko/assetBroadcastFix 
Fixed asset lifecycle message broadcasting in cluster mode
 2023-04-28 18:43:26 +03:00
Andrii Shvaika
89efe12c45 Fix Equals And HashCode issue for Device/Asset/EntityView Info 2023-04-28 17:09:01 +03:00
YevhenBondarenko
0f66c5901b fixed using default timeout and improvements 2023-04-28 16:05:10 +02:00
Vladyslav_Prykhodko
74e8f29611 Updated in home page widgets bundle description and image 2023-04-28 16:20:08 +03:00
dashevchenko
d35987a347 minor refactoring 2023-04-28 16:16:38 +03:00
AndriiD
ad48c7510d upd 2023-04-28 15:28:39 +03:00
AndriiD
73833a666b Merge branch 'develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
 2023-04-28 15:08:44 +03:00
ViacheslavKlimov
bf7454ad3c Move rate limiting to one service 2023-04-28 14:28:16 +03:00
Andrii Shvaika
7a385e34d1 DeviceInfo for Edge support 2023-04-28 14:27:17 +03:00
Andrii Shvaika
9e589c8044 Device info view improvements 2023-04-28 14:10:33 +03:00
dashevchenko
91b58742df minor fix 2023-04-28 13:16:44 +03:00
dashevchenko
5f0baee3b5 fixed asset lifecycle broadcasting for cluster mode 2023-04-28 12:19:39 +03:00