AndriiD
|
07e834bee0
|
Merge remote-tracking branch 'origin/develop/3.5' into feature/work-1385-custom-mqtt-subscribe-topic
# Conflicts:
# application/pom.xml
# application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java
# application/src/test/java/org/thingsboard/server/transport/mqtt/AbstractMqttIntegrationTest.java
# common/actor/pom.xml
# common/cache/pom.xml
# common/cluster-api/pom.xml
# common/coap-server/pom.xml
# common/dao-api/pom.xml
# common/data/pom.xml
# common/edge-api/pom.xml
# common/message/pom.xml
# common/pom.xml
# common/queue/pom.xml
# common/stats/pom.xml
# common/transport/coap/pom.xml
# common/transport/http/pom.xml
# common/transport/lwm2m/pom.xml
# common/transport/mqtt/pom.xml
# common/transport/pom.xml
# common/transport/snmp/pom.xml
# common/transport/transport-api/pom.xml
# common/util/pom.xml
# common/version-control/pom.xml
# dao/pom.xml
# msa/black-box-tests/pom.xml
# msa/js-executor/pom.xml
# msa/pom.xml
# msa/tb-node/pom.xml
# msa/tb/pom.xml
# msa/transport/coap/pom.xml
# msa/transport/http/pom.xml
# msa/transport/lwm2m/pom.xml
# msa/transport/mqtt/pom.xml
# msa/transport/pom.xml
# msa/transport/snmp/pom.xml
# msa/vc-executor-docker/pom.xml
# msa/vc-executor/pom.xml
# msa/web-ui/pom.xml
# netty-mqtt/pom.xml
# pom.xml
# rest-client/pom.xml
# rule-engine/pom.xml
# rule-engine/rule-engine-api/pom.xml
# rule-engine/rule-engine-components/pom.xml
# tools/pom.xml
# transport/coap/pom.xml
# transport/http/pom.xml
# transport/lwm2m/pom.xml
# transport/mqtt/pom.xml
# transport/pom.xml
# transport/snmp/pom.xml
# ui-ngx/pom.xml
# ui-ngx/src/assets/locale/locale.constant-zh_CN.json
|
2023-03-17 04:38:18 +02:00 |
|
Artem Dzhereleiko
|
5e212366c2
|
UI: Fixed height of expation panel for widget settings
|
2023-03-16 14:30:02 +02:00 |
|
Igor Kulikov
|
41d6f383c6
|
UI: Entities table header style improvement.
|
2023-03-16 13:26:58 +02:00 |
|
Igor Kulikov
|
fde346d8e4
|
UI: Router tabs improvements. Improve entities table to watch router data changes.
|
2023-03-16 13:07:10 +02:00 |
|
Artem Dzhereleiko
|
1172d1ce77
|
UI: Fixed expantion panel with hint
|
2023-03-16 13:05:46 +02:00 |
|
Artem Dzhereleiko
|
e96e355a31
|
UI: Fixed stepper for device and device profile dialog
|
2023-03-16 11:05:23 +02:00 |
|
Artem Dzhereleiko
|
8c64b76b14
|
UI: fix ui
|
2023-03-15 12:06:47 +02:00 |
|
Igor Kulikov
|
8c2046853d
|
UI: Router tabs improvements
|
2023-03-13 16:38:14 +02:00 |
|
Andrii Shvaika
|
ab5769a252
|
Merge with develop/3.5
|
2023-03-13 15:52:06 +02:00 |
|
Vladyslav_Prykhodko
|
75e0f335b9
|
UI: Change notification style and send notification error
|
2023-03-10 18:23:25 +02:00 |
|
Artem Dzhereleiko
|
74b8fe18b2
|
Merge remote-tracking branch 'upstream/develop/3.5' into AD/refactoring/form-style
|
2023-03-10 16:20:41 +02:00 |
|
Artem Dzhereleiko
|
dd75ae23b5
|
UI: fixed VC
|
2023-03-10 15:56:22 +02:00 |
|
Igor Kulikov
|
926c364575
|
UI: Router tabs component improvements. Remove alarm rules page.
|
2023-03-10 14:58:16 +02:00 |
|
Igor Kulikov
|
0780669498
|
Merge with develop/3.5
|
2023-03-10 12:56:00 +02:00 |
|
Andrew Shvayka
|
20e4905e84
|
Merge pull request #8186 from thingsboard/feature/mqtt/sparkplug
MQTT Sparkplug protocol support
|
2023-03-10 12:45:59 +02:00 |
|
Vladyslav_Prykhodko
|
2863bbadc5
|
UI: Change notification style
|
2023-03-09 17:10:09 +02:00 |
|
Igor Kulikov
|
1f036995e3
|
UI: Flot widget - set normal letter spacing
|
2023-03-09 15:36:13 +02:00 |
|
Vladyslav_Prykhodko
|
c173cba872
|
Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system
|
2023-03-09 14:45:39 +02:00 |
|
ViacheslavKlimov
|
8fcbe876e8
|
Merge branch 'develop/3.5' into feature/notification-system
# Conflicts:
# pom.xml
|
2023-03-08 18:16:16 +02:00 |
|
Andrii Shvaika
|
3477ddac0f
|
Refactoring due to comments
|
2023-03-08 17:39:39 +02:00 |
|
Igor Kulikov
|
4972d0f43e
|
UI: Map widgets -> reset map state when subscription changed (alias or key filters).
|
2023-03-08 17:14:44 +02:00 |
|
Igor Kulikov
|
62affb04f9
|
UI: Fix map widget fit to bounds in draggable mode
|
2023-03-08 16:25:50 +02:00 |
|
Vladyslav_Prykhodko
|
c5fc212c79
|
Merge remote-tracking branch 'klimov/feature/notification-system' into feature/notification-system
|
2023-03-08 15:16:48 +02:00 |
|
Vladyslav_Prykhodko
|
da8962ac54
|
UI: Change style notification system and improv notification ws
|
2023-03-08 15:16:07 +02:00 |
|
Igor Kulikov
|
b81612e249
|
Merge branch 'develop/3.5' of github.com:thingsboard/thingsboard into develop/3.5
|
2023-03-08 15:00:01 +02:00 |
|
Igor Kulikov
|
e4671e10a6
|
UI: markdown component and markdown widget improvements
|
2023-03-08 14:59:49 +02:00 |
|
Andrii Shvaika
|
c905f20224
|
Merge remote-tracking branch 'origin/develop/3.5' into feature/mqtt/sparkplug
|
2023-03-08 13:27:17 +02:00 |
|
ViacheslavKlimov
|
a56261ac9d
|
Merge with develop/3.5
|
2023-03-08 13:11:31 +02:00 |
|
Andrew Shvayka
|
6cc8b8e6a8
|
Merge pull request #8098 from thingsboard/feature/alarm-assign
Alarm assignment to users
|
2023-03-08 11:06:55 +02:00 |
|
rusikv
|
411da14083
|
Moved changed to optional assignee id in alarm query constructor to end
|
2023-03-07 18:30:58 +02:00 |
|
Igor Kulikov
|
43783f0379
|
UI: Markdown component and markdown widget style improvements
|
2023-03-07 18:25:15 +02:00 |
|
Andrii Shvaika
|
c9b37237c1
|
Merge with develop/3.5
|
2023-03-07 16:21:57 +02:00 |
|
Artem Dzhereleiko
|
2e807f319d
|
UI: Fixed form style
|
2023-03-07 16:03:14 +02:00 |
|
Igor Kulikov
|
cb500840f7
|
UI: Improve dashboard page CSS
|
2023-03-06 18:47:07 +02:00 |
|
Igor Kulikov
|
c9ae2767ff
|
UI: Fix markdown widget css
|
2023-03-06 18:21:46 +02:00 |
|
Andrii Shvaika
|
aadf7f8295
|
Merge with develop/3.5
|
2023-03-06 17:59:37 +02:00 |
|
Igor Kulikov
|
8187a367de
|
UI: Fix entities table widget cell background style
|
2023-03-06 17:58:37 +02:00 |
|
Igor Kulikov
|
1c997aba32
|
UI: Fix alarm load for alarm details dialog
|
2023-03-06 17:37:42 +02:00 |
|
Igor Kulikov
|
87076952ac
|
UI: dashboard toolbar state selector fix
|
2023-03-06 15:45:54 +02:00 |
|
Igor Kulikov
|
b6b61f3f54
|
UI: Minor fixes
|
2023-03-06 13:32:28 +02:00 |
|
Vladyslav_Prykhodko
|
069ef4de5b
|
Merge remote-tracking branch 'upstream/develop/3.5' into feature/notification-system
|
2023-03-06 10:21:41 +02:00 |
|
Kalutka Zhenya
|
30f822fdc9
|
Added hint to the "Password / access token" input (Repository settings)
|
2023-03-03 16:27:20 +02:00 |
|
Igor Kulikov
|
52544487b7
|
UI: VC layout improvements
|
2023-03-02 15:22:55 +02:00 |
|
Igor Kulikov
|
8c8de8c188
|
UI: Minor improvements
|
2023-03-02 10:25:06 +02:00 |
|
rusikv
|
3384823988
|
Fixes due to angular 15 version upgrade
|
2023-03-01 17:19:58 +02:00 |
|
Andrii Shvaika
|
6b121514fc
|
Merge with develop/3.5
|
2023-02-28 19:06:54 +02:00 |
|
Andrii Shvaika
|
ce77d5d1bc
|
Merge remote-tracking branch 'origin/feature/angular15' into feature/alarm-assign
|
2023-02-28 18:34:02 +02:00 |
|
Igor Kulikov
|
1b73595e59
|
UI: Angular 15 migration
|
2023-02-28 15:14:36 +02:00 |
|
rusikv
|
69aafef568
|
Changed display comments button position, moved comments dialog actions on top, added ignore loading on writing comments and reassign
|
2023-02-28 15:04:03 +02:00 |
|
Igor Kulikov
|
d81add6fd7
|
UI: Angular 15 migration
|
2023-02-27 16:24:50 +02:00 |
|