nick
|
4fe63cee70
|
lwm2m: add exception to ObserveCompositeCancel
|
2024-01-17 10:31:17 +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 Landiak
|
b3f5d9885b
|
Merge remote-tracking branch 'upstream/master' into develop/3.7
|
2024-01-16 11:49:43 +02:00 |
|
Andrii Shvaika
|
5acf527f1a
|
Version set to 3.7.0-SNAPSHOT
|
2024-01-16 11:43:44 +02:00 |
|
Andrii Shvaika
|
a3471c367a
|
Merge PR#9968
|
2024-01-16 11:35:31 +02:00 |
|
YevhenBondarenko
|
60be820915
|
merge with master
|
2024-01-15 18:51:00 +01:00 |
|
Andrii Landiak
|
28e9aae2e5
|
Merge remote-tracking branch 'upstream/master' into feature/edge-alarm-comment-support
|
2024-01-15 16:15:08 +02:00 |
|
Andrew Shvayka
|
d8073cdce4
|
Merge pull request #9990 from thingsboard/feature/grouping-interval-types
New types of the grouping intervals: WEEK, WEEK_ISO, MONTH, QUARTER
|
2024-01-15 13:40:58 +02:00 |
|
Andrii Landiak
|
f8440a4053
|
Merge remote-tracking branch 'upstream/develop/3.7' into feature/broadcast-logs-improvement
|
2024-01-12 14:59:17 +02:00 |
|
Andrii Landiak
|
78bcb5c4b4
|
Merge remote-tracking branch 'upstream/develop/3.7' into feature/broadcast-logs-improvement
|
2024-01-11 16:46:53 +02:00 |
|
YevhenBondarenko
|
200eed6cf5
|
merge with develop/3.7
|
2024-01-11 12:36:21 +01:00 |
|
Andrii Shvaika
|
ee08f33d98
|
TimeZone name links
|
2024-01-11 12:51:52 +02:00 |
|
Andrii Shvaika
|
7fc2231189
|
Interval types back-end implementation
|
2024-01-11 12:40:50 +02:00 |
|
Andrii Landiak
|
cae0aaf964
|
Fix license headers. Add test for alarm comments from edge
|
2024-01-10 13:04:38 +02:00 |
|
Andrii Landiak
|
1256f09e7e
|
Introduce edge support for alarm comment
|
2024-01-10 10:19:07 +02:00 |
|
Andrii Shvaika
|
e3041adc42
|
Grouping interval structures
|
2024-01-09 18:18:10 +02:00 |
|
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 |
|
YevhenBondarenko
|
c0036d22c0
|
merge with master
|
2024-01-09 09:57:53 +01:00 |
|
Igor Kulikov
|
c5a72ed8df
|
Update license header to 2024 year.
|
2024-01-09 10:46:16 +02:00 |
|
YevhenBondarenko
|
5647db457a
|
Merge branch 'develop/3.6.3' of github.com:thingsboard/thingsboard into feature/queue-in-rule-node
|
2024-01-08 13:31:54 +01:00 |
|
ViacheslavKlimov
|
66c196cbcb
|
Merge remote-tracking branch 'origin/master' into feature/push-notifications
|
2024-01-05 13:02:44 +02:00 |
|
dashevchenko
|
e9c8445e53
|
merged with develop/3.7
|
2024-01-03 20:02:15 +02:00 |
|
Volodymyr Babak
|
d329df0323
|
Merge remote-tracking branch 'upstream/master' into feature/broadcast-logs-improvement
|
2024-01-02 19:37:39 +02:00 |
|
nick
|
38fc45ffc1
|
Merge branch 'develop/3.7' into californium_3_9_1
|
2023-12-28 15:16:58 +02:00 |
|
YevhenBondarenko
|
61602330ec
|
merge with 3.7
|
2023-12-28 12:16:14 +01:00 |
|
ViacheslavKlimov
|
7bf58e3891
|
Major refactoring for mobile app notifications
|
2023-12-28 12:30:41 +02:00 |
|
Igor Kulikov
|
bc35df1dd7
|
Version set to 3.6.3-SNAPSHOT
|
2023-12-27 12:58:15 +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 |
|
nick
|
03560f0557
|
lwm2ml: add tests attributes
|
2023-12-26 17:26:51 +02: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 |
|
ViacheslavKlimov
|
58cf97f68a
|
Add maxResourceSize to SystemParams
|
2023-12-22 12:38:56 +02:00 |
|
YevhenBondarenko
|
16cb74f0b5
|
merge with master
|
2023-12-20 22:08:19 +01:00 |
|
Andrii Landiak
|
323e0ef9a2
|
Fix edge upgrade strategy: add check for upgrade instruction on server side, fix typo
|
2023-12-19 17:43:17 +02:00 |
|
dashevchenko
|
e779c06ec1
|
changed AttributeService interface to accept AttributeScope instead of String
|
2023-12-18 14:20:29 +02:00 |
|
YevhenBondarenko
|
5eadc90d26
|
added custome serializer for device profile
|
2023-12-18 10:00:47 +01:00 |
|
Igor Kulikov
|
562838cfdb
|
UI: Add Embed Image dialog.
|
2023-12-15 17:10:33 +02:00 |
|
YevhenBondarenko
|
4101fc3963
|
added upgrade tests, and minor fixes
|
2023-12-14 21:14:31 +01:00 |
|
YevhenBondarenko
|
5869378c2c
|
Implemented Json serialization, added custom serializer for the Device redis cache
|
2023-12-14 20:02:53 +01:00 |
|
dashevchenko
|
b30bbf9d80
|
attribute_kv optimization: deleted entity_type column, updated attribute_type and attribute_key columns
|
2023-12-14 19:05:54 +02:00 |
|
ViacheslavKlimov
|
a058f865da
|
Rename to publicResourceKey
|
2023-12-14 17:57:41 +02:00 |
|
ViacheslavKlimov
|
36a89bea91
|
Public images
|
2023-12-14 16:24:36 +02:00 |
|
Andrew Shvayka
|
cd0d2d4212
|
Merge pull request #9819 from thingsboard/image-gallery-improvements
Fixes and improvements for image API
|
2023-12-12 18:02:21 +02:00 |
|
YevhenBondarenko
|
3fea0f88f3
|
moved queueName from rule-node config to rule-node
|
2023-12-12 14:03:48 +01:00 |
|
ViacheslavKlimov
|
0ae62e7a57
|
Remove @Length validation for image fields
|
2023-12-11 17:42:04 +02:00 |
|
Andrew Shvayka
|
2a3960ff64
|
Merge pull request #9775 from dashevchenko/passwordValidation
Added max length password policy
|
2023-12-11 17:17:52 +02:00 |
|
Volodymyr Babak
|
d25b1a4170
|
Merge remote-tracking branch 'origin/master' into edge-upgrade-instructions
|
2023-12-08 10:31:06 +02:00 |
|