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

12118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vladyslav
2bc5771472
Merge pull request #7925 from ArtemDzhereleiko/AD/notification-system/user-phone-number 
Added phone number to user profile
 2023-01-11 17:46:00 +02:00
Artem Dzhereleiko
67a5725cf0 UI: Refactoring 2023-01-11 17:40:57 +02:00
Artem Dzhereleiko
57f88960f7 UI: Added phone number to user profile 2023-01-11 17:29:07 +02:00
ViacheslavKlimov
7524dd9258 Remove NotificationOriginatorType, use EntityType; refactor NotificationInfo 2023-01-11 15:18:22 +02:00
ViacheslavKlimov
38c9d5dcd8 Move delivery methods to notification template; refactoring 2023-01-11 14:58:18 +02:00
ViacheslavKlimov
b7f4ed1e4b Add 'description' to notification target 2023-01-09 13:25:20 +02:00
ViacheslavKlimov
e2760372df Merge remote-tracking branch 'origin/feature/notification-system' into feature/notification-system 2023-01-09 13:09:08 +02:00
ViacheslavKlimov
5c5d683236 Add indexes for notification entities; refactoring 2023-01-08 13:42:43 +02:00
Vladyslav_Prykhodko
9051759ce8 UI: Add notification center and targets notification block 2023-01-06 19:28:12 +02:00
ViacheslavKlimov
1317a8aca9 Rename WebSocket delivery method to push-notification; refactoring 2023-01-06 18:34:35 +02:00
ViacheslavKlimov
654e61683a Improvements and refactoring 2023-01-06 17:50:34 +02:00
ViacheslavKlimov
141bd74113 Notification target and template api docs; improvements 2023-01-02 17:25:03 +02:00
Vladyslav_Prykhodko
f47005892d UI: Add notification service 2022-12-29 18:03:16 +02:00
Vladyslav_Prykhodko
8d238e5e35 Fixed call updated script for notification service 2022-12-27 14:34:43 +02:00
Andrii Shvaika
509da5dee4 Merge branch 'feature/notification-system' of github.com:ViacheslavKlimov/thingsboard into feature/notification-system 2022-12-27 13:07:55 +02:00
Andrii Shvaika
34d7a6ced8 Merge remote-tracking branch 'origin/master' into develop/3.5 2022-12-27 13:06:46 +02:00
Andrii Shvaika
9cb5889050 Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5 2022-12-27 13:06:36 +02:00
ViacheslavKlimov
409976c6a3 Multiple notification targets for request; improvements and refactoring 2022-12-23 18:47:40 +02:00
Andrew Shvayka
19513ec027
Merge pull request #7804 from ShvaykaD/feature/base-entity-service-improvement 
[3.5] improvements for base entity service v2
 2022-12-22 14:14:47 +02:00
ShvaykaD
652a8c9e89 added getEntityType method in EntityDaoService 2022-12-22 13:02:39 +02:00
Andrii Shvaika
83b2005601 Merge branch 'feature/base-entity-service-improvement' of github.com:ShvaykaD/thingsboard into develop/3.5 2022-12-22 11:41:50 +02:00
ViacheslavKlimov
7792e80283 Merge branch 'master' into feature/notification-system 2022-12-21 17:53:41 +02:00
Igor Kulikov
c12ab39ff4
Merge pull request #7824 from vvlladd28/bug/alarm-table/update-timewindow 
Fixed incorrect updated timewindow in Alarm table
 2022-12-21 17:34:49 +02:00
Vladyslav_Prykhodko
b9d361f1cf UI: Fixed incorrect updated timewindow in Alarm table 2022-12-21 17:23:51 +02:00
ViacheslavKlimov
0a17f99360 Refactoring; TbSlackNode 2022-12-21 15:04:06 +02:00
Igor Kulikov
1c53a90c1a Fix field constraint validation message 2022-12-21 12:36:24 +02:00
Igor Kulikov
acfb357135 Update UI help link 2022-12-20 16:59:45 +02:00
Igor Kulikov
eb10ba3c3c Update pkg.upgradeVersion 2022-12-20 16:50:26 +02:00
ViacheslavKlimov
58b9b1b6d3 Clear notification system entities on cascade on tenant's deletion 2022-12-19 20:07:52 +02:00
ViacheslavKlimov
738b9dc494 Slack notification channel; refactoring 2022-12-19 19:56:20 +02:00
Igor Kulikov
1d179b725b Update TBEL version to 1.0.5 2022-12-19 13:24:00 +02:00
Andrew Shvayka
84c82d08a7
Merge pull request #7792 from volodymyr-babak/edge/misc-fixes 
[3.4.3][Bug] Edge root rule chain update fix. USER entity support added. INACTIVITY_TIMEOUT pushed to edge.
 2022-12-19 11:56:47 +02:00
Andrew Shvayka
8326c75766
Merge pull request #7812 from ViacheslavKlimov/improvement/rule-node-config-validation 
[3.4.3] Validation for rule node configuration
 2022-12-19 11:54:29 +02:00
ViacheslavKlimov
55fc7131fb Validation for rule node configuration; improve validation error message 2022-12-17 16:58:58 +02:00
Igor Kulikov
a8fb435ab7
Merge pull request #7795 from vvlladd28/feauture/multiple-input-widget/fixed=action-button 
[3.4.3] UI: Always visible action button in multiple input widgets
 2022-12-16 16:04:54 +02:00
Igor Kulikov
52d12e044c
Merge pull request #7785 from vvlladd28/improvement/language/da-dk 
[3.4.3] UI: Add new Danish language
 2022-12-16 16:00:43 +02:00
Igor Kulikov
f53744ccff
Merge pull request #7782 from ArtemDzhereleiko/AD/bug-fix/catalan-designator 
[3.4.3] UI: Fixed Catalan locale designator
 2022-12-16 15:59:49 +02:00
Igor Kulikov
092a71dbb4
Merge pull request #7758 from vvlladd28/bug/bulk-import/validation-name 
[3.4.3] UI: Fixed validation in bulk import and improvement bulk import for Edge
 2022-12-16 15:54:41 +02:00
ShvaykaD
3d27340cb5 fix audit log tests 2022-12-16 15:52:20 +02:00
ShvaykaD
9e33a8d7be fix typo after refactoring in BaseEntityServiceRegistryTest 2022-12-15 16:59:26 +02:00
ShvaykaD
e74a5686a2 added message for assertNotNull check in BaseEntityServiceRegistryTest 2022-12-15 16:32:39 +02:00
ViacheslavKlimov
4b39d2a221 Notification request stats 2022-12-15 15:50:01 +02:00
ViacheslavKlimov
aa89d0e936 Merge branch 'master' into feature/notification-system 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/plugin/TbWebSocketHandler.java
#	application/src/main/java/org/thingsboard/server/service/ws/DefaultWebSocketService.java
#	application/src/test/java/org/thingsboard/server/controller/BaseWebsocketApiTest.java
#	application/src/test/java/org/thingsboard/server/controller/TbTestWebSocketClient.java
 2022-12-15 15:32:26 +02:00
ShvaykaD
1d5bf98504 removed unused import in DefaultEntityServiceRegistry 2022-12-15 15:22:53 +02:00
ShvaykaD
da0a0aed30 fix typo after refactoring 2022-12-15 15:18:01 +02:00
ShvaykaD
5c5b83c4ce updated logic & fix typos after review 2022-12-15 15:10:38 +02:00
Volodymyr Babak
268f0499bf Merge branch 'master' of github.com:thingsboard/thingsboard into edge/misc-fixes 2022-12-15 14:53:39 +02:00
Andrew Shvayka
985b985265
Merge pull request #7801 from dashevchenko/addedDeviceProfileServiceToTbContext 
[3.4.3] Added DeviceProfileService and AssetProfileService to TBContext
 2022-12-15 14:39:21 +02:00
Andrew Shvayka
6b53b609a3
Merge pull request #7803 from YevhenBondarenko/fix/bulk-import-test 
[3.4.3]fixed bulk import test infinite await
 2022-12-15 14:37:58 +02:00
Andrii Shvaika
aadc2e35b7 Merge with master 2022-12-15 14:27:13 +02:00