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

1940 Commits

Author SHA1 Message Date
zbeacon
f29d1b0eff Added HasLabel, HasEmail, HasTitle interfaces to get correctly label in entityService, refactoring for alarms processing. The main point is swithing from Alarm entity to AlarmInfo 2022-12-13 13:39:09 +02:00
ViacheslavKlimov
1ba77a30d7 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/queue/DefaultTbCoreConsumerService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
 2022-12-13 12:55:21 +02:00
Andrew Shvayka
0ee678e234
Merge pull request #7761 from ViacheslavKlimov/fix/entity-view-ts 
[3.4.3] Fix no timeseries data in widget for entity view; fix State Chart invalid behavior
 2022-12-12 15:54:29 +02:00
zbeacon
08e356a415 Updated alarm assignment to send websocket update on assign, added originator label to alarm info 2022-12-12 13:00:22 +02:00
ViacheslavKlimov
4851f1af9f Fix comparing entity versions: ignore tenantId and createdTime 2022-12-09 19:03:57 +02:00
ViacheslavKlimov
808b1dc0c5 'Show merge commits' option in repository settings 2022-12-09 18:31:59 +02:00
dashevchenko
8a157397d4 added rest controller for alarm comments 2022-12-08 17:04:30 +02:00
nickAS21
e95fed13ed sparkPlug: add to TransportConfiguration sparkPlug 2022-12-08 13:59:11 +02:00
ViacheslavKlimov
28d6e4c736 Copy queryId when updating query 2022-12-08 13:16:34 +02:00
Igor Kulikov
109caee7c7 Version set to 3.4.3-SNAPSHOT 2022-12-05 17:54:19 +02:00
zbeacon
591708b029 Merge remote-tracking branch 'upstream/develop/3.5' into feature-alarm-assigning 2022-12-05 15:23:09 +02:00
Andrii Shvaika
770f069f22 Version set to 3.4.2 2022-12-01 12:04:14 +02:00
zbeacon
0dcde60443 Added alarm assignment feature and tests for it 2022-11-30 13:06:00 +02:00
ShvaykaD
3820909d65 bugfix: #7683 2022-11-25 16:36:32 +02:00
Igor Kulikov
d10f64c348 Refactor MVEL -> TBEL 2022-11-22 16:38:01 +02:00
Andrew Shvayka
a1c4d29e48
Merge pull request #7636 from ViacheslavKlimov/fix/additional-info-xss 
[3.4.2] Validation for entity's additionalInfo
 2022-11-17 17:40:46 +02:00
ViacheslavKlimov
e7995fb02c Validation for entity's additionalInfo 2022-11-17 15:33:12 +02:00
Andrii Shvaika
0d1412cd46 Merge branch 'jwt-random' of github.com:smatvienko-tb/thingsboard 2022-11-17 11:50:56 +02:00
Volodymyr Babak
1d9a2bad84 Improve error handling - root cause and stack trace delivered to cloud from edge in case of errors 2022-11-15 14:59:14 +02:00
Sergey Matvienko
7e5ab3bff7 JWT settings refactored packages, Swagger documented, rest client getJwtSettings and saveJwtSettings added 2022-11-14 18:52:57 +01:00
ViacheslavKlimov
684ef4a658 Add ability to update notification request 2022-11-11 14:06:09 +02:00
ViacheslavKlimov
6e8dba6e2c More tests for notifications 2022-11-10 15:42:29 +02:00
Volodymyr Babak
0a56f065f7 Merge RPC request/response actions 2022-11-10 09:35:06 +02:00
Volodymyr Babak
8b46b30747 Merge remote-tracking branch 'upstream/master' into feature/edge-rpc-call-from-device 2022-11-09 18:34:01 +02:00
Andrew Shvayka
ef1965ed44
Merge pull request #7560 from YevhenBondarenko/feature/asset-profile-upgrade 
[3.4.2] upgrade asset-profiles using ExecutorService
 2022-11-09 15:34:45 +02:00
YevhenBondarenko
03aafd4c3c added TbServiceQueue asset validation and upgrade improvements 2022-11-09 13:28:42 +01:00
ViacheslavKlimov
165e86c82b Notification rules processing; refactoring 2022-11-08 16:04:50 +02:00
Volodymyr Babak
22118af4db Added Edge RPC response/request support 2022-11-08 13:13:58 +02:00
Andrii Shvaika
9def5a30c6 Add missing method to StringUtils 2022-11-08 10:55:28 +02:00
Andrii Shvaika
0873b9e158 Improvements to #7434 2022-11-07 18:12:28 +02:00
Andrii Shvaika
6e33b09205 Merge branch 'feature/jwt-token-outdate-on-logout' of github.com:CooL16/thingsboard 2022-11-07 17:30:23 +02:00
ViacheslavKlimov
48023495a8 Notification api refactoring 2022-11-07 13:50:16 +02:00
ViacheslavKlimov
e391459343 Merge remote-tracking branch 'origin/master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultAlarmSubscriptionService.java
#	application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java
#	dao/src/main/java/org/thingsboard/server/dao/user/UserDao.java
#	rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
 2022-11-06 18:55:41 +02:00
ViacheslavKlimov
12ae902cfc Notification rules initial implementation 2022-11-06 18:13:02 +02:00
ViacheslavKlimov
3734a0da49 Notifications api permission checks, WS improvements, new target configs 2022-11-04 15:29:15 +02:00
oyurov
4fad587940 Refactoring 2022-11-03 16:52:15 +01:00
oyurov
3ab1f34594 Clean code 2022-11-02 14:07:49 +01:00
oyurov
6d34aa237c Refactoring 2022-11-02 13:03:17 +01:00
ShvaykaD
e9961a3a39 merge with master 2022-11-02 12:00:05 +02:00
oyurov
d10289253f Refactor 2022-11-02 08:46:58 +01:00
devaskim
11eca7684a
Add default constructor to fix deserialization issue. 2022-11-01 20:49:49 +05:00
devaskim
8f49f2a021 Introduce NOT option for relation query. 2022-11-01 16:14:39 +05:00
Volodymyr Babak
19287fa250 Merge remote-tracking branch 'origin/master' into feature/edge-limit-attempt 2022-10-31 19:09:25 +02:00
Andrew Shvayka
3844ff6372
Merge pull request #7395 from volodymyr-babak/feature/edge-multi-customers 
[3.4.2] Edge PE - customers hierarchy support
 2022-10-31 18:49:01 +02:00
Andrew Shvayka
7ba76e8f59
Merge pull request #7483 from deaflynx/version-control-read-only 
[3.4.2] Feature: Version control Repository settings with 'Read-only' flag
 2022-10-31 18:05:58 +02:00
ViacheslavKlimov
4d34c328d6 New TbNotificationNode; refactoring 2022-10-31 17:44:21 +02:00
ViacheslavKlimov
89d2a337e1 WebSocket API for notifications; refactoring 2022-10-31 14:05:08 +02:00
ViacheslavKlimov
4c61d63149 Upgrade script, indexes 2022-10-31 14:04:29 +02:00
Andrew Shvayka
f20d87e894
Merge pull request #7360 from devaskim/selective_widget_bundler_version_control 
[3.4.2] UI: Let user to selective export widget bundles to version control.
 2022-10-31 13:54:35 +02:00
Volodymyr Babak
7c80781c24 Minor code refactoring - added tenant as entity id 2022-10-28 15:41:57 +03:00