709 Commits

Author SHA1 Message Date
ViacheslavKlimov
2ee4d10621 Update TBEL version to 1.2.0 2024-03-19 16:24:06 +02:00
ViacheslavKlimov
4ed952a9d6 Merge branch 'master' into develop/3.7 2024-03-19 15:44:23 +02:00
Andrew Shvayka
a8e1ac9257
Merge pull request #8522 from thingsboard/feature/push-notifications
Notifications to mobile app
2024-02-16 16:15:39 +02:00
Armin Felder
3c306a2e70 update logback to 1.4.14 to allow for json logging 2024-02-14 23:23:25 +01:00
Rhyaldir
f35ce53fce Add mockito-inline to support mocking statics and final classes 2024-01-31 14:13:57 +01:00
nick
41adbe1003 coap: final version 2024-01-30 16:37:14 +02:00
nick
cdc6daa7a9 lwm2m: fix buf license excludes 2024-01-22 10:57:05 +02:00
nick
7a173f98bf lwm2m: comments1 2024-01-21 15:50:31 +02:00
nick
32e3d9050b Merge branch 'develop/3.7' into californium_3_9_1
# Conflicts:
#	application/src/test/java/org/thingsboard/server/transport/lwm2m/rpc/sql/RpcLwm2mIntegrationWriteAttributesTest.java
2024-01-16 21:15:44 +02:00
Andrii Shvaika
5acf527f1a Version set to 3.7.0-SNAPSHOT 2024-01-16 11:43:44 +02:00
YevhenBondarenko
60be820915 merge with master 2024-01-15 18:51:00 +01:00
YevhenBondarenko
71bd6f2bd2 added tests for proto entities 2024-01-10 21:47:39 +01:00
Vladyslav_Prykhodko
5739802fda Merge remote-tracking branch 'upstream/master' into feature/push-notifications 2024-01-09 15:20:49 +02:00
Igor Kulikov
c5a72ed8df Update license header to 2024 year. 2024-01-09 10:46:16 +02:00
nick
38fc45ffc1 Merge branch 'develop/3.7' into californium_3_9_1 2023-12-28 15:16:58 +02:00
Igor Kulikov
bc35df1dd7 Version set to 3.6.3-SNAPSHOT 2023-12-27 12:58:15 +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
YevhenBondarenko
1fc704bae1 test fixes and minor refactoring 2023-12-26 11:08:06 +01:00
YevhenBondarenko
feb44656f1 merge with master 2023-12-26 00:58:31 +01:00
nick
74daec474f lwm2ml: ver 3.9.1 - start 2023-12-25 22:09:39 +02:00
nick
e6aee089c3 tbBel: ver 1.1.5 2023-12-18 17:49:34 +02:00
YevhenBondarenko
a537ad9b20 fixed flaky tests 2023-12-11 15:50:03 +01:00
ViacheslavKlimov
ebfab0e941 Merge branch 'master' into feature/image-resources 2023-12-04 12:57:57 +02:00
nick
3bfde753f0 tbel Release 1.1.5 2023-12-02 10:59:45 +02:00
ViacheslavKlimov
2d26fdcb95 Fixes and improvements for images processing 2023-11-30 20:49:09 +02:00
dashevchenko
ba2e877a08 refactoring: moved proto files and converter classes to separate module - proto 2023-11-30 13:06:44 +02:00
Igor Kulikov
e6136148bb Update apache batik version. Fix some svg images. 2023-11-17 12:37:25 +02:00
ViacheslavKlimov
f95fcdf3dd Merge with master 2023-11-16 15:18:27 +02:00
ViacheslavKlimov
19968b5c10 Image descriptor, image preview, refactoring 2023-11-14 16:06:59 +02:00
Andrii Shvaika
df24c363ce Version set to 3.6.2-SNAPSHOT 2023-11-13 17:07:32 +02:00
Igor Kulikov
afa54ef277 Update TBEL version to 1.1.4 2023-11-10 19:36:39 +02:00
nick
edfc72ad2a tbel Release 1.1.3 2023-10-30 14:14:40 +02:00
Andrii Shvaika
58f99f30b6 Merge with master 2023-10-27 15:38:21 +03:00
Andrii Shvaika
9d6ed79123 Bump TBEL version 2023-10-26 13:03:25 +03:00
Andrew Shvayka
cf603b6e50
Merge pull request #9325 from thingsboard/fix_bug_TS_M_To_MS
[fix_bug][3.6]tbel: Integer from Json to Long
2023-10-25 16:03:16 +03:00
Andrii Shvaika
0c1e5393df Replace copy-paste with the correct library 2023-10-03 19:18:34 +03:00
Andrii Shvaika
0360e655ae Merge with master 2023-10-03 18:49:57 +03:00
Andrii Shvaika
e768afc948 Merge 3.6 -> 3.7 2023-09-28 12:20:06 +03:00
Andrii Shvaika
dd4b874b5f Version set to 3.6.1-SNAPSHOT 2023-09-27 17:38:27 +03:00
nick
533fb83ec7 tbe: fix_bug Integer from Json to Long 2023-09-27 15:12:34 +03:00
Igor Kulikov
8cefca23ac Version set to 3.6.1-SNAPSHOT 2023-09-25 11:27:00 +03:00
Andrii Shvaika
f8cd40fe71 Avoid type conversion in TbUtils.stringToBytes 2023-09-08 16:27:55 +03:00
Igor Kulikov
88f10881b2 Update TBEL version to 1.1.0 2023-09-06 17:52:05 +03:00
Igor Kulikov
98c245e293 Switch to version 3.6.0 2023-09-05 18:28:15 +03:00
nick
bfa41e7edd tbel: fix_bug unable resolve function with for 2023-08-30 14:36:47 +03:00
nick
9c57108a59 tbel: add break to for, foreach 2023-08-16 07:37:55 +03:00
nick
698dfba952 tbel: rollback validation switch 2023-08-01 14:56:50 +03:00
YevhenBondarenko
1a12d3c395 merge with develop/3.6 2023-06-29 23:40:43 +02:00
Andrii Shvaika
ecae72e994 Merge with develop/3.5.2 2023-06-29 17:00:23 +03:00
YevhenBondarenko
0e72c36628 minor improvements 2023-06-12 14:42:50 +02:00