IrynaMatveieva
|
ce92740f1f
|
review fixes
|
10 months ago |
|
IrynaMatveieva
|
4e4dfdfe65
|
fixed compilation error in tests
|
10 months ago |
|
IrynaMatveieva
|
61f06a0b9b
|
fixed tests
|
10 months ago |
|
IrynaMatveieva
|
d59de750d0
|
refactoring
|
10 months ago |
|
IrynaMatveieva
|
9c564dc0d9
|
fixed test
|
10 months ago |
|
IrynaMatveieva
|
dd977782f9
|
Merge branch 'master' of github.com:thingsboard/thingsboard into feature/cf-output
|
10 months ago |
Vladyslav Prykhodko
|
d6001a700c
|
Merge pull request #14326 from ArtemDzhereleiko/AD/bug-fix/force-2fa-email-description-translate
Add translate for email description force 2fa
|
10 months ago |
Viacheslav Klimov
|
59a2876a98
|
Merge pull request #14206 from dashevchenko/entitiesLimitFix
Fixed entity limit check race condition
|
10 months ago |
|
Viacheslav Klimov
|
aa06df623a
|
Merge pull request #14338 from thingsboard/fix/alarm-notification-test
Fix alarm details in notification rules test
|
10 months ago |
|
Viacheslav Klimov
|
61c695238d
|
Fix alarm details in notification rules test
|
10 months ago |
dashevchenko
|
889b4be21e
|
refactoring
|
10 months ago |
|
Vladyslav_Prykhodko
|
7a13183d5b
|
UI: Add CF output strategy
|
10 months ago |
ArtemDzhereleiko
|
2a8f2a8e73
|
UI: add translate for email description force 2fa
|
10 months ago |
|
dashevchenko
|
78c52e3141
|
fixes after merge
|
10 months ago |
|
Viacheslav Klimov
|
be07bd4322
|
Merge pull request #14325 from thingsboard/fix/2fa-enforce
Fixed 2FA enforcement for sysadmin user
|
10 months ago |
|
Viacheslav Klimov
|
eb189693d5
|
Add test for 2FA enforcement for sysadmin user
|
10 months ago |
|
dashevchenko
|
2c3fc140d1
|
fixes after merge
|
10 months ago |
|
dashevchenko
|
b8062bbbab
|
merged with master
|
10 months ago |
|
Viacheslav Klimov
|
5c5fd7c67e
|
Merge pull request #13962 from dashevchenko/javaRestClientUpdate
Updated Java rest client with missing methods
|
10 months ago |
|
Viacheslav Klimov
|
de19470031
|
Merge pull request #14310 from dskarzh/remove-cf-links-persistence
Removed redundant persistence of CF links
|
10 months ago |
|
dashevchenko
|
5b479e7298
|
test improvements
|
10 months ago |
|
Viacheslav Klimov
|
91f1d1885c
|
Merge pull request #14287 from dashevchenko/keysWithCommaFix
Fixed telemetry deletion for keys with comma
|
10 months ago |
|
Viacheslav Klimov
|
443aff0071
|
Update ATTRIBUTES_KEYS_DESCRIPTION
|
10 months ago |
|
Viacheslav Klimov
|
f011eec81d
|
Apply suggestions from code review
|
10 months ago |
|
dashevchenko
|
6d832f5199
|
refactoring
|
10 months ago |
|
Viacheslav Klimov
|
dcd9b9d6a6
|
Merge pull request #14321 from thingsboard/rc
rc
|
10 months ago |
|
Viacheslav Klimov
|
d1c9cebbdf
|
Merge pull request #14320 from thingsboard/lts-4.2
Lts 4.2
|
10 months ago |
|
Vladyslav Prykhodko
|
cd50b3ee33
|
Merge pull request #14316 from ArtemDzhereleiko/AD/bug-fix/geofencing-path-to-zone-limit-icon-color
Fixed icon color max level warning hint for geofencing related level
|
10 months ago |
|
Vladyslav Prykhodko
|
ae82efcf39
|
Merge pull request #14317 from ArtemDzhereleiko/AD/bug-fix/api-usage-widget
Fixed API Usage widget max limit init value and make alias required
|
10 months ago |
|
Vladyslav Prykhodko
|
cb5a3807dd
|
Merge pull request #14318 from ArtemDzhereleiko/AD/force-2fa/fixed-panel-toggle-index
Fixed expansion panel for force 2fa settings
|
10 months ago |
|
Vladyslav Prykhodko
|
761f943045
|
Merge pull request #14319 from ArtemDzhereleiko/AD/alarm-rule/doc-link
Alarm rule remove button to documentation
|
10 months ago |
|
ArtemDzhereleiko
|
b815aa02dc
|
UI: Remove button to doc
|
10 months ago |
|
Viacheslav Klimov
|
7928daeb01
|
Merge pull request #14236 from AndriiLandiak/alarm-template-improvement
Added support for alarm originator label and alarm details in notification templates
|
10 months ago |
Andrii Landiak
|
31aaf6e8e2
|
Fix potential issue with details init
|
10 months ago |
|
Andrii Landiak
|
a229e450c3
|
Fix notification template files
|
10 months ago |
|
ArtemDzhereleiko
|
7f7ab7bff3
|
UI: Fixed expansion panel for force 2fa settings
|
10 months ago |
|
Andrii Landiak
|
39c66fde6c
|
Merge remote-tracking branch 'upstream/master' into alarm-template-improvement
|
10 months ago |
|
Vladyslav Prykhodko
|
49368d920e
|
Merge pull request #14296 from mtsymbarov-del/fix/queue-statistics-alias-type
Fixed typo in get queue statistics request method
|
10 months ago |
|
ArtemDzhereleiko
|
171da34946
|
UI: Fixed max limit init value and make aliase required
|
10 months ago |
|
Vladyslav Prykhodko
|
fbfff76e32
|
Merge pull request #14298 from mtsymbarov-del/fix/control-widget-parser-fn
Fixed parse function calling for control widgets
|
10 months ago |
|
IrynaMatveieva
|
558a13b5b0
|
refactored cf output
|
10 months ago |
|
ArtemDzhereleiko
|
79b5250944
|
UI: Fixed icon color max level warning hint
|
10 months ago |
|
Vladyslav Prykhodko
|
fd682b7204
|
Merge pull request #14311 from ArtemDzhereleiko/AD/bug-fix/cf-alarm-rule/validation-ct-disabled-option
Bug fixs for alarm rule and enhancement calculated fields
|
10 months ago |
|
ArtemDzhereleiko
|
e1ddc5fd0e
|
UI: Custom schedule align to center
|
10 months ago |
|
ArtemDzhereleiko
|
f911a6d2d9
|
UI: bug fix calculated fileds
|
10 months ago |
Dmytro Skarzhynets
|
1e2c127e1c
|
Remove redundant persistence of CF links
# Conflicts:
# application/src/main/data/upgrade/basic/schema_update.sql
# common/dao-api/src/main/java/org/thingsboard/server/dao/cf/CalculatedFieldService.java
# common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/BaseCalculatedFieldConfiguration.java
# common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java
# common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/GeofencingCalculatedFieldConfiguration.java
# dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java
# dao/src/test/java/org/thingsboard/server/dao/service/CalculatedFieldServiceTest.java
|
10 months ago |
|
IrynaMatveieva
|
5918bbf082
|
fixed timeout and removed unnecessary abtract classes
|
10 months ago |
|
IrynaMatveieva
|
f821f8195b
|
Merge branch 'master' of github.com:thingsboard/thingsboard into feature/cf-output
|
10 months ago |
|
IrynaMatveieva
|
256f4c3121
|
added checks when no updated attributes
|
10 months ago |
|
IrynaMatveieva
|
31ed28a6fe
|
restructured output strategies
|
10 months ago |
