dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,028 Commits 106 Branches 71 Tags
Commit Graph

1162 Commits

Author SHA1 Message Date
Andrew Shvayka
283ec2aa1a
Merge pull request #5583 from thingsboard/develop/3.3.3 
Develop 3.3.3 to Master
 2021-12-30 11:28:50 +02:00
Andrew Shvayka
2734757f32
Merge pull request #5765 from volodymyr-babak/edge-event-sort-fix-2 
[3.3.3] Edge tests fixes #2
 2021-12-29 12:42:23 +02:00
YevhenBondarenko
8c4d40dd68 merge with master 2021-12-29 08:52:56 +02:00
Volodymyr Babak
9d0867e272 Fixed queue start ts display on UI - use value instead of last update ts. Fixed ++ for queuestartts 2021-12-24 16:44:29 +02:00
Igor Kulikov
c94aa3a25a Improve markdown widget. Fix parent state params sync in dashboard state component when dashboard edit mode changed. 2021-12-24 15:53:18 +02:00
Igor Kulikov
40c2d71488 Improve parent state change handling by dashboard state component 2021-12-23 19:26:58 +02:00
Igor Kulikov
3ae20647aa Implement sync with parent state params for dashboard state component 2021-12-23 19:01:43 +02:00
Igor Kulikov
3874f8ff46 Add ability to set widget and dashboard level CSS. Introduce dashboard state component with ability to be embedded inside markdown widget. 2021-12-22 17:15:10 +02:00
Igor Kulikov
688293843d
Merge pull request #5757 from vvlladd28/improvement/multiple-attribute/custom-icon-get-set-function 
[3.3.3] UI: Improvement multiple attribute widget
 2021-12-21 17:30:03 +02:00
Igor Kulikov
0477e065d5 Improve map widgets: ability to return marker and tooltip offset from marker image function 2021-12-21 17:19:30 +02:00
Vladyslav_Prykhodko
49a9a3136f UI: Improvement multiple attribute widget 2021-12-21 12:35:09 +02:00
Igor Kulikov
3950b58845 Add tooltip offset settings for map widgets. Improve default values handling by json schema form component. 2021-12-21 09:47:37 +02:00
Vladyslav_Prykhodko
38bc05100e UI: Fixed incorrect work edit rectangle with cut 2021-12-20 18:35:18 +02:00
Igor Kulikov
66d6b8d687 Map rectangles support 2021-12-20 17:52:19 +02:00
Igor Kulikov
f8c1985add
Merge pull request #5729 from Terny22/lwm2m-fix-bug-transport-start-without-bootstrap 
[3.3.3] UI: Refactoring LwM2M Config with enabled/disabled bootstrap
 2021-12-16 17:38:16 +02:00
Igor Kulikov
43bfa73b7d
Merge pull request #5667 from vvlladd28/map/fixed/enable-polygon-edit 
[3.3.3] UI: Fixed incorrect disable polygon-editor in trip animation widgets
 2021-12-16 17:33:46 +02:00
Igor Kulikov
6b000b254c
Merge pull request #5637 from ArtemDzhereleiko/imp/translation/rsa-key 
[3.3.3] UI: Change translation rsa-key to certificate-pem-format and delete in other languages
 2021-12-16 17:21:46 +02:00
YevhenBondarenko
f0c2b5df35 Merge branch 'master' of github.com:thingsboard/thingsboard into develop/3.3.3 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/service/install/SqlDatabaseUpgradeService.java
#	application/src/main/resources/thingsboard.yml
#	application/src/test/java/org/thingsboard/server/transport/TransportSqlTestSuite.java
#	common/transport/lwm2m/src/main/java/org/thingsboard/server/transport/lwm2m/config/LwM2MTransportServerConfig.java
#	ui-ngx/src/app/modules/home/components/profile/device/lwm2m/lwm2m-profile-components.module.ts
 2021-12-16 15:47:51 +02:00
Sergey Tarnavskiy
bb99ef14ed Refactoring LwM2M Config with enabled/disabled bootstrap 2021-12-15 13:26:20 +02:00
Igor Kulikov
d6e18d05cd Introduce Flow rule node type. Add rile node UIs for RuleChain input/output. Remove rule chain connection metadata. 2021-12-08 15:35:59 +02:00
Igor Kulikov
a69551f067 Angular 12 migration 2021-12-06 12:54:48 +02:00
Vladyslav_Prykhodko
a65af3774e UI: Fixed incorrect disable polygon-editor in trip animation widgets 2021-12-02 11:24:47 +02:00
ArtemDzhereleiko
bfa7b519ce UI: Change translation rsa-key to certificate-pem-format and delete in other languages 2021-11-29 18:18:10 +02:00
Vladyslav_Prykhodko
4f342b5961 UI: Fixed widgets maps backward compatibility for save location 2021-11-29 12:00:34 +02:00
Vladyslav_Prykhodko
bdb7d0905d UI: Fixed incorrect URL for default marker icon in maps widget 2021-11-29 11:42:41 +02:00
Sergey Tarnavskiy
f9aab73e92 Added new option for including Bootstrap Serer updates 2021-11-26 17:53:06 +02:00
Igor Kulikov
45d4a8b453
Merge pull request #5628 from ArtemDzhereleiko/fix/widgets-settings/firefox 
[3.3.3] UI: Fix setting layout for Firefox
 2021-11-26 17:15:13 +02:00
Vladyslav_Prykhodko
79251adb3a UI: Revert code for backward-compatible after having updated editors in maps widgets 2021-11-26 16:01:21 +02:00
Igor Kulikov
eda4e0f761 Fixed right layout and state name propagation in mobile mode, skip popover/dialog dashboard changes. 2021-11-26 13:47:07 +02:00
Igor Kulikov
715eefa6d0
Merge pull request #5616 from vvlladd28/improvement/map-widgets/marker-placement 
[3.3.3] UI: Improvement add/edit location marker/polygon in maps widgets
 2021-11-26 13:44:17 +02:00
Vladyslav_Prykhodko
d17f70494f UI: Fixed open dashboard state in separate dialog showed a blank dialog 2021-11-26 12:41:04 +02:00
Vladyslav_Prykhodko
2e8b9b5cd7 UI: Improvement add/edit location marker/polygon in maps widgets 2021-11-24 13:03:52 +02:00
Andrii Shvaika
c51ade482a Merge with master 2021-11-24 12:00:11 +02:00
ArtemDzhereleiko
5da827bf48 UI: Fix layout for firefox 2021-11-22 17:02:16 +02:00
Sergey Tarnavskiy
a77d4c8dec Minor fixes for main commits 2021-11-19 17:15:27 +02:00
Sergey Tarnavskiy
c532bc6508 Fixed bug with UI updating of bootstrap-config for LwM2M device-profiles 2021-11-19 16:08:56 +02:00
Sergey Tarnavskiy
31a1af5814 Fixed bug with missing required credential-config for LwM2M device-profiles. 2021-11-19 15:18:42 +02:00
Sergey Tarnavskiy
25abfcebf3 Bootstrap servers refactoring for LwM2M transport 2021-11-15 18:48:03 +02:00
Vladyslav_Prykhodko
ec84c9cf51 UI: Fixed json attribute widget - showed two errors at the same time. 2021-11-10 13:02:15 +02:00
Vladyslav_Prykhodko
04b0bc4c81 UI: Fixed fields length validation for rule nodes and alarm rules 2021-11-09 16:37:21 +02:00
Andrew Shvayka
f24924ddf2
Merge pull request #5512 from Terny22/lwm2m_help_tooltips 
[3.3.3] Lwm2m help-tooltips
 2021-11-08 17:37:25 +02:00
Andrii Shvaika
942c316e8a Merge with master 2021-11-08 17:36:49 +02:00
Vladyslav_Prykhodko
de44eb4440 UI: Improvement style for mqtt transport settings in device profile 2021-11-08 17:21:52 +02:00
Sergey Tarnavskiy
4ad4b90484 Reafctoring of helping-tooltips for Lwm2m form-configs 2021-11-08 11:31:50 +02:00
Igor Kulikov
ddb60eae40
Merge pull request #5495 from vvlladd28/improvemen/map/trip-animation 
[3.3.2 ]UI: Improvement trip animation: fixed calculate start/endpoint; fixed…
 2021-11-04 18:56:10 +02:00
Vladyslav_Prykhodko
5764287a12 UI: Improvement trip animation: fixed calculate start/endpoint; fixed update current position 2021-11-04 18:09:05 +02:00
Viacheslav Klimov
2d845c7840 Merge remote-tracking branch 'origin/master' into fields-validation 
# Conflicts:
#	application/src/main/java/org/thingsboard/server/controller/TelemetryController.java
#	common/data/src/main/java/org/thingsboard/server/common/data/Customer.java
#	common/data/src/main/java/org/thingsboard/server/common/data/DeviceProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
#	common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResource.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TbResourceInfo.java
#	common/data/src/main/java/org/thingsboard/server/common/data/TenantProfile.java
#	common/data/src/main/java/org/thingsboard/server/common/data/alarm/Alarm.java
#	common/data/src/main/java/org/thingsboard/server/common/data/edge/Edge.java
#	common/data/src/main/java/org/thingsboard/server/common/data/relation/EntityRelation.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleChain.java
#	common/data/src/main/java/org/thingsboard/server/common/data/rule/RuleNode.java
#	common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
 2021-11-04 12:43:54 +02:00
Igor Kulikov
6417ef7cd0
Merge pull request #5486 from ArtemDzhereleiko/imp/widget-settings/no-data-message 
[3.2.2] UI: New widget settings with input field no data message
 2021-11-03 18:51:38 +02:00
Vladyslav_Prykhodko
d53d4362b7 UI: Refactoring noDataDisplayMessageText 2021-11-03 17:57:00 +02:00
Igor Kulikov
460418acbb
Merge pull request #5479 from Terny22/toast-target-id 
[3.3.2] UI: Added "toastTargetId" of widget-container to the "widgetContext" to be able showing toast-messages inside widget's area.
 2021-11-03 16:36:45 +02:00