16797 Commits

Author SHA1 Message Date
Vladyslav_Prykhodko
83c3a6b3c9 Updated license header 2024-01-09 16:34:10 +02:00
Vladyslav_Prykhodko
5739802fda Merge remote-tracking branch 'upstream/master' into feature/push-notifications 2024-01-09 15:20:49 +02:00
Igor Kulikov
c5f85c3140 Update license header 2024-01-09 14:54:32 +02:00
Igor Kulikov
bd2c991eb2 UI: Improve image gallery browse action -> switch from popover to responsive dialog. 2024-01-09 14:53:32 +02:00
Igor Kulikov
3085fae5cc Update pkg.upgradeVersion variable 2024-01-09 10:56:04 +02:00
Igor Kulikov
c5a72ed8df Update license header to 2024 year. 2024-01-09 10:46:16 +02:00
Igor Kulikov
041e7588d4
Merge pull request #9960 from thingsboard/feature/bar-chart-with-labels
Bar chart with labels widget
2024-01-09 10:44:09 +02:00
Igor Kulikov
8c398620f8 Merge branch 'master' into feature/bar-chart-with-labels 2024-01-09 10:19:37 +02:00
Igor Kulikov
f7fc127e36 UI: Implement bar chart with labels widget. Improve echarts initialization. Improve timewindow component to set preferred aggregation interval for selected timewindow. Fix data aggregator to schedule interval with maximum allowed setTimeout delay. 2024-01-08 19:34:07 +02:00
ViacheslavKlimov
a39b679df0 Add notificationSettings cache specs to application-test.properties 2024-01-08 11:39:50 +02:00
ViacheslavKlimov
b1c0a04426 Delete notification settings on tenant deletion 2024-01-08 11:11:16 +02:00
Andrii Shvaika
67a8f70957 Merge remote-tracking branch 'origin/develop/3.6.3' 2024-01-05 15:17:27 +02:00
Andrew Shvayka
8c1fe956ff
Merge pull request #9921 from thingsboard/fiix_bug_testsDateJDKVer
TbDateTests_JDK_ver
2024-01-05 15:15:27 +02:00
ViacheslavKlimov
17a3065c64 Add tests for mobile app notifications 2024-01-05 13:52:57 +02:00
ViacheslavKlimov
1c83790f9b Fix schema_update.sql 2024-01-05 13:04:02 +02:00
ViacheslavKlimov
66c196cbcb Merge remote-tracking branch 'origin/master' into feature/push-notifications 2024-01-05 13:02:44 +02:00
Andrew Shvayka
c43a265868
Merge pull request #9924 from ShvaykaD/fix/slow-query-for-rule-node-ids-search
Optimize rule nodes ids search in the upgrade process
2024-01-03 13:41:05 +02:00
ShvaykaD
22fbacdc56 Merge branch 'master' into fix/slow-query-for-rule-node-ids-search 2024-01-03 11:21:45 +02:00
ShvaykaD
14b3dd4b57 updated columns order in index 2024-01-03 10:36:08 +02:00
Andrew Shvayka
426b0b83a8
Merge pull request #9915 from dashevchenko/aws_sqs_producer
TbAwsSqsProducerTemplate fix
2024-01-02 18:17:44 +02:00
Igor Kulikov
06e06797b3 UI: Bar chart with labels widget 2024-01-02 17:30:51 +02:00
ShvaykaD
f14e6cdfca added missing switch case to ThingsboardInstallService 2024-01-02 15:56:37 +02:00
ShvaykaD
360e32684e added new index for rule nodes ids search query and removed old one 2024-01-02 15:34:32 +02:00
ShvaykaD
4a26fad0a5 Revert "replaced slow query with multi-call of indexed query"
This reverts commit abfcf32c54e2705171d93abbb563fbdec97def5d and 7c42bb72138536c4f78351c1c992ec0d1780d8ea.
2024-01-02 15:31:30 +02:00
dashevchenko
5e471364de changed fixedPool to newWorkStealingPool 2024-01-02 13:58:16 +02:00
ShvaykaD
7c42bb7213 Change for loop to iterate forwards 2023-12-29 10:55:38 +02:00
ShvaykaD
abfcf32c54 replaced slow query with multi-call of indexed query 2023-12-28 17:55:56 +02:00
Igor Kulikov
fad53afdfb Merge branch 'master' into develop/3.6.3 2023-12-28 16:31:13 +02:00
ViacheslavKlimov
bb14dd611e Firebase settings only for sysadmin 2023-12-28 16:06:16 +02:00
nick
c636ea2c0e fix_bug: TbDateTests -> JDK ver 2023-12-28 14:51:45 +02:00
ViacheslavKlimov
ad4e212edf Migrate user settings to jsonb 2023-12-28 13:03:19 +02:00
ViacheslavKlimov
7bf58e3891 Major refactoring for mobile app notifications 2023-12-28 12:30:41 +02:00
Igor Kulikov
f11ee730b5 Update rule nodes UI 2023-12-28 10:41:30 +02:00
dashevchenko
b95adb439a added yml parameters for aws-sqs eproducer executor thread pool size 2023-12-27 17:06:26 +02:00
dashevchenko
f2ea1b87d7 added shutdown for producerExecutor 2023-12-27 14:51:20 +02:00
dashevchenko
ca3593b6f5 Merge remote-tracking branch 'upstream/master' into aws_sqs_producer 2023-12-27 14:45:46 +02:00
dashevchenko
63a85161b2 moved producer executor to TbAwsSqsAdmin 2023-12-27 14:44:49 +02:00
dashevchenko
3ac0cc241a TbAwsSqsProducerTemplate: native thread allocation error fix (provided one executor for message sending with limited thread pool size) 2023-12-27 13:47:52 +02:00
Igor Kulikov
bc35df1dd7 Version set to 3.6.3-SNAPSHOT 2023-12-27 12:58:15 +02:00
Andrew Shvayka
0df7b11827
Merge pull request #9910 from volodymyr-babak/edge-test-fix
Fixed EdgeControllerTest.testSyncEdge
2023-12-27 11:58:13 +02:00
Andrew Shvayka
b2805acd90
Merge pull request #9911 from thingsboard/fix/public-image-import
Fix image's isPublic on import
2023-12-27 11:57:23 +02:00
ViacheslavKlimov
b256f3a8cd Refactor MobileDeliveryMethodNotificationTemplate 2023-12-27 11:54:14 +02:00
ViacheslavKlimov
6c0c891f60 Merge branch 'master' into feature/push-notifications
# Conflicts:
#	application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/NotificationDeliveryMethod.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/targets/NotificationTargetType.java
#	common/data/src/main/java/org/thingsboard/server/common/data/notification/template/DeliveryMethodNotificationTemplate.java
#	pom.xml
#	ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.html
#	ui-ngx/src/app/modules/home/pages/notification/sent/sent-notification-dialog.component.scss
#	ui-ngx/src/app/modules/home/pages/notification/template/template-configuration.ts
#	ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.html
#	ui-ngx/src/app/modules/home/pages/notification/template/template-notification-dialog.component.scss
#	ui-ngx/src/app/shared/models/notification.models.ts
2023-12-27 11:49:28 +02:00
ViacheslavKlimov
22e598c36d Fix image's isPublic on import 2023-12-26 18:21:34 +02:00
Volodymyr Babak
5915aed545 Code cleanup 2023-12-26 15:47:15 +02:00
Volodymyr Babak
9a1b2c923c Fixed testSyncEdge - moved creation of edge before device/asset creation to have time to process set edge root rule chain before activation 2023-12-26 15:46:02 +02:00
Igor Kulikov
ace148884c UI: Image Gallery: Hide overlay buttons from image card in selection mode. 2023-12-26 15:41:56 +02:00
Andrew Shvayka
5cc0dc6d94
Merge pull request #9900 from thingsboard/fix/vc-timeout
Version control performance improvements
2023-12-22 18:42:06 +02:00
Andrew Shvayka
3d07fff2cd
Merge pull request #9902 from dashevchenko/multipart_env_variables
Added spring multipart parameters to http transport
2023-12-22 17:51:40 +02:00
Igor Kulikov
73f443f65d
Merge pull request #9893 from volodymyr-babak/edge-ui-fixes
Changes to be in sync with PE
2023-12-22 17:31:22 +02:00