Andrew Shvayka
|
263b3132bc
|
Merge pull request #8573 from YevhenBondarenko/refactoring/table-name-constant
table name constants refactoring
|
2023-05-19 17:09:22 +03:00 |
|
Andrew Shvayka
|
da9bea1f20
|
Merge pull request #8519 from adovh/replace_ObjectMapper_usages_with_JacksonUtil
[3.5.1]Replace object mapper usages with jackson utils
|
2023-05-19 17:07:16 +03:00 |
|
Andrew Shvayka
|
27c88e914d
|
Merge pull request #8556 from dashevchenko/smsDisabledFlag
Added feature to disable sms messaging
|
2023-05-19 16:51:43 +03:00 |
|
Viacheslav Klimov
|
e3646c9ea9
|
Merge branch 'develop/3.5.1' into feature/notification-configs-vc
|
2023-05-19 15:40:48 +02:00 |
|
ShvaykaD
|
a7410e9912
|
fixed license format
|
2023-05-19 14:23:31 +03:00 |
|
ViacheslavKlimov
|
3cdd293173
|
Merge with develop/3.5.1
|
2023-05-19 14:21:21 +03:00 |
|
ShvaykaD
|
2c251e2f5c
|
remove duplicate logic for TbGetOriginatorFieldsNode and TbRelatedAttributesNode && fix typos
|
2023-05-19 13:58:53 +03:00 |
|
Vladyslav_Prykhodko
|
31858ea48e
|
Merge remote-tracking branch 'upstream/develop/3.5.1' into feature/notification-rules-disabling
|
2023-05-19 13:51:57 +03:00 |
|
ShvaykaD
|
b8eb239c39
|
Merge branch 'develop/3.5.1' of github.com:thingsboard/thingsboard into feature/enrichment-rule-nodes-improvements
|
2023-05-18 18:57:26 +03:00 |
|
ShvaykaD
|
cfcf539c50
|
added upgrade logic tests && added fixes for review comments
|
2023-05-18 18:55:00 +03:00 |
|
dashevchenko
|
45e1a17be3
|
refactoring
|
2023-05-18 18:30:50 +03:00 |
|
YevhenBondarenko
|
57674888ca
|
table name constants refactoring
|
2023-05-18 17:29:29 +02:00 |
|
dashevchenko
|
49c230c815
|
refactoring
|
2023-05-18 17:58:45 +03:00 |
|
Andrew Shvayka
|
b42159cb6f
|
Merge pull request #8442 from YevhenBondarenko/model-constants-refactoring
removed redundant constants
|
2023-05-18 12:16:28 +03:00 |
|
Andrii Shvaika
|
b869f39722
|
Merge branch 'master' into develop/3.5.1
|
2023-05-18 12:14:22 +03:00 |
|
Sergey Matvienko
|
1c67d36c47
|
alarm repository: fixed tests
|
2023-05-17 18:30:12 +02:00 |
|
ShvaykaD
|
21e5a1a130
|
added logic update to the rule nodes upgrade script
|
2023-05-17 18:03:35 +03:00 |
|
Andrew Shvayka
|
001d088873
|
Merge pull request #8559 from smatvienko-tb/hotfix/SqlPartitioningRepository_hotfix_partition_already_pending_detach_in_partitioned_table
[hotfix][3.5.0] SqlPartitioningRepository hotfix: partition already pending detach in partitioned table
|
2023-05-17 17:41:14 +03:00 |
|
Andrii Shvaika
|
519a5c7688
|
Line wrap
|
2023-05-17 16:34:30 +03:00 |
|
dashevchenko
|
b083ab98e0
|
updated GET /resources api to filter resources by type
|
2023-05-17 15:10:57 +03:00 |
|
ViacheslavKlimov
|
ce83ee4444
|
Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits
# Conflicts:
# application/src/test/java/org/thingsboard/server/service/notification/NotificationRuleApiTest.java
|
2023-05-17 12:28:51 +03:00 |
|
ViacheslavKlimov
|
2483c89055
|
Merge remote-tracking branch 'origin/develop/3.5.1' into improvements/rate-limits
|
2023-05-17 12:28:24 +03:00 |
|
Sergey Matvienko
|
333159373d
|
removed unused import org.springframework.data.jpa.repository.query.Procedure;
|
2023-05-17 10:32:30 +02:00 |
|
Sergey Matvienko
|
a6c39fe68c
|
alarm repository fix: This statement does not declare an OUT parameter
|
2023-05-17 10:30:42 +02:00 |
|
Sergey Matvienko
|
c499f701b1
|
SqlPartitioningRepository hotfix: partition already pending detach in partitioned table
|
2023-05-17 10:15:01 +02:00 |
|
ShvaykaD
|
5831876b8e
|
added upgrade script logic for all enrichment rule nodes && additional improvements to TbGetRelatedAttributeNode
|
2023-05-16 15:57:30 +03:00 |
|
dashevchenko
|
a6c52809cd
|
added sms disabled feature for tenant profile configuration
|
2023-05-16 15:04:39 +03:00 |
|
AndriiD
|
f95c64591e
|
fixed pr comments
|
2023-05-15 11:52:05 +03:00 |
|
Igor Kulikov
|
0beb2d7033
|
Merge branch 'master' into develop/3.5.1
|
2023-05-12 15:43:22 +03:00 |
|
ViacheslavKlimov
|
b7f19a12cf
|
Version control for notification configs
|
2023-05-12 14:54:14 +03:00 |
|
ViacheslavKlimov
|
5cec1b8af2
|
Ability to disable notification rule
|
2023-05-11 14:57:40 +03:00 |
|
AndriiD
|
7187fbb4d3
|
Replace object mapper usages with jackson utils
|
2023-05-10 14:10:58 +03:00 |
|
Andrii Shvaika
|
ee30581859
|
Install views in tests
|
2023-05-08 17:43:27 +03:00 |
|
Andrew Shvayka
|
1a366d476e
|
Revert "[3.5.1]Replace object mapper usages with jackson utils"
|
2023-05-08 14:54:21 +03:00 |
|
YevhenBondarenko
|
f1876456ca
|
moved views and functions to a separate file
|
2023-05-08 13:47:57 +02:00 |
|
AndriiD
|
15d8b8ce91
|
Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil
|
2023-05-08 13:07:32 +03:00 |
|
ViacheslavKlimov
|
ead9d3be70
|
Merge with develop/3.5.1
|
2023-05-08 12:54:07 +03:00 |
|
YevhenBondarenko
|
260a3a2d41
|
merge with master
|
2023-05-05 09:53:35 +02:00 |
|
AndriiD
|
93c219c83e
|
renamed base controller/service tests
|
2023-05-04 16:43:13 +03:00 |
|
AndriiD
|
32e5d8561b
|
Merge remote-tracking branch 'origin/develop/3.5.1' into replace_ObjectMapper_usages_with_JacksonUtil
# Conflicts:
# application/src/main/java/org/thingsboard/server/controller/SystemInfoController.java
# dao/src/test/java/org/thingsboard/server/dao/service/BaseOAuth2ConfigTemplateServiceTest.java
# rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbMsgToEmailNode.java
# rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/mail/TbSendEmailNode.java
# rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsFilterNodeTest.java
# rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbJsSwitchNodeTest.java
# rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/rest/TbRestApiCallNodeTest.java
# rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/transform/TbTransformMsgNodeTest.java
|
2023-05-04 14:35:41 +03:00 |
|
Andrew Shvayka
|
86743b907a
|
Merge pull request #8464 from thingsboard/improvements/notification-system
Notifications deduplication; upgrade improvements
|
2023-05-04 12:47:03 +03:00 |
|
AndriiD
|
0e84fc1c6a
|
removed redundant tests
|
2023-05-04 12:35:53 +03:00 |
|
Andrii Shvaika
|
f969f07f2f
|
Minor performance optimization
|
2023-05-03 16:27:41 +03:00 |
|
Andrii Shvaika
|
87bcaabad5
|
Default valid keys cache for 24 hours
|
2023-05-03 15:26:53 +03:00 |
|
ViacheslavKlimov
|
84e39af7c7
|
Send notification about new platform version only to sysadmins
|
2023-05-03 13:35:01 +03:00 |
|
YevhenBondarenko
|
0ae1be3aa5
|
kv validator improvements
|
2023-05-03 11:44:59 +02:00 |
|
ViacheslavKlimov
|
c39e8568ae
|
Upgrade improvements for notification system
|
2023-05-02 12:46:50 +03:00 |
|
YevhenBondarenko
|
fbf9773a61
|
optimize imports
|
2023-05-02 10:57:58 +02:00 |
|
Andrew Shvayka
|
d03f236263
|
Merge pull request #8440 from thingsboard/improvements/notification-system
Improvements for notification system
|
2023-05-01 12:43:48 +03:00 |
|
AndriiD
|
73833a666b
|
Merge branch 'develop/3.5' into replace_ObjectMapper_usages_with_JacksonUtil
# Conflicts:
# application/src/main/java/org/thingsboard/server/service/action/EntityActionService.java
|
2023-04-28 15:08:44 +03:00 |
|