6023 Commits

Author SHA1 Message Date
Igor Kulikov
241f28f254 Merge with master 2024-08-07 14:20:58 +03:00
Max Petrov
28cfb10a1e
Merge branch 'master' into fix/4108-opc-value-types-adjustments 2024-08-07 10:57:42 +03:00
Vladyslav_Prykhodko
51dfba02f7 UI: Add support manage dashboard layout 2024-08-07 10:22:34 +03:00
ViacheslavKlimov
7007563627 Merge remote-tracking branch 'origin/hotfix/3.7' into master-hotfix 2024-08-06 19:46:05 +03:00
Max Petrov
14e7ac67a4
Merge branch 'master' into fix/4108-opc-value-types-adjustments 2024-08-06 19:20:09 +03:00
mpetrov
e2dd4ee430 Added posibility of discrete value pick in OPC value type keys 2024-08-06 19:17:55 +03:00
Igor Kulikov
78257ee9f6
Merge pull request #11354 from maxunbearable/improvements/050824-gateway
Gateway Improvements
2024-08-06 17:49:13 +03:00
Igor Kulikov
d433373774
Merge pull request #11331 from vvlladd28/bug/audit-log-table/missing-action-type
Added missing audit log action type and improved audit log table handler translation
2024-08-06 17:47:21 +03:00
Igor Kulikov
09238cada5
Update locale.constant-en_US.json 2024-08-06 17:46:42 +03:00
Igor Kulikov
bd25679e30
Merge pull request #11326 from vvlladd28/bug/mobile-app/open-dashboard-wait-init
Fixed issue with opening dashboards in the mobile app on iOS
2024-08-06 17:43:21 +03:00
Igor Kulikov
e1bae1eda5 Merge with master 2024-08-06 17:40:29 +03:00
mpetrov
66522fbfc3 Merge branch 'improvements/4097-modbus-adjustments' into improvements/050824-gateway 2024-08-06 16:48:33 +03:00
mpetrov
7cec89e9ef disable slave fix 2024-08-06 16:47:35 +03:00
mpetrov
a291e1d2e3 refactoring 2024-08-06 16:23:21 +03:00
mpetrov
5813722a0e interceptor to core 2024-08-06 16:22:05 +03:00
mpetrov
9b4644a8c9 Merge branch 'improvements/4097-modbus-adjustments' into improvements/050824-gateway 2024-08-06 15:17:53 +03:00
mpetrov
7dd9e47065 minor fixes 2024-08-06 15:13:18 +03:00
mpetrov
31259a4d56 Version Conflict UI implementation 2024-08-06 12:48:24 +03:00
Vladyslav_Prykhodko
675b4755ed UI: Add new widget action copy and edit in contect menu 2024-08-06 11:26:00 +03:00
Vladyslav_Prykhodko
5bef47253e UI: Add new widget action copy and edit 2024-08-06 10:07:55 +03:00
Vladyslav_Prykhodko
d9ad4bd0a0 Merge remote-tracking branch 'origin/feature/dashboard-layout' into feature/dashboard-layout-scada 2024-08-06 09:28:21 +03:00
Vladyslav Prykhodko
3ea10fe733 UI: Added new widget action copy and edit widget 2024-08-05 23:24:09 +03:00
Chantsova Ekaterina
399bfb8dbd UI: timeinterval component redesign 2024-08-05 18:48:52 +03:00
Vladyslav_Prykhodko
c59e5f5c90 Merge branch 'feature/dashboard-layout' into feature/dashboard-layout-scada 2024-08-05 16:17:35 +03:00
Vladyslav_Prykhodko
4c353534cc UI: Added select layout and clear dashboard json 2024-08-05 16:09:41 +03:00
mpetrov
a5e804d3b4 Merge branch 'fix/4102-gayeway-synced-save-adjustments' into improvements/050824-gateway 2024-08-05 14:57:27 +03:00
mpetrov
299c929cd0 Merge branch 'fix/4074-connectors-tables-unnexpected-tooltips' into improvements/050824-gateway 2024-08-05 14:56:47 +03:00
mpetrov
d16838e22a Merge branch 'fix/4088-connector-tables-row-description' into improvements/050824-gateway 2024-08-05 14:56:26 +03:00
mpetrov
7b48379edc Merge branch 'fix/4095-slave-config-values-visibility' into improvements/050824-gateway 2024-08-05 14:55:56 +03:00
mpetrov
09f20a2e32 Merge branch 'task/4081-update-modbus-rpc-templates' into improvements/050824-gateway 2024-08-05 14:55:39 +03:00
mpetrov
c810dfe54f Merge branch 'fix/4099-opc-empty-config' into improvements/050824-gateway 2024-08-05 14:55:16 +03:00
mpetrov
844c36f10d Merge branch 'improvements/4097-modbus-adjustments' into improvements/050824-gateway 2024-08-05 14:54:44 +03:00
mpetrov
b824763b1b Merge branch 'task/4098-modbus-tabs-validation' into improvements/050824-gateway 2024-08-05 14:53:13 +03:00
mpetrov
1e89a62d3f format headers 2024-08-05 14:42:59 +03:00
Max Petrov
86deab7750
Merge branch 'master' into improvements/4097-modbus-adjustments 2024-08-05 14:41:41 +03:00
mpetrov
915929f793 refactoring 2024-08-05 14:24:34 +03:00
mpetrov
4e71093aca changed connector update approach 2024-08-05 13:05:07 +03:00
Artem Dzhereleiko
eb66fd30cc UI: Refactoring 2024-08-05 10:21:51 +03:00
Artem Dzhereleiko
e74d6f4534 UI: Refactoring 2024-08-05 09:38:48 +03:00
Vladyslav Prykhodko
963160efa6 UI: Added support difference dashboard layout for one state 2024-08-05 00:49:43 +03:00
mpetrov
4bbfb09ab4 shared directives adjustments 2024-08-02 18:34:23 +03:00
Chantsova Ekaterina
d464b317a4 UI: start introducing custom interval option instead of advanced option 2024-08-02 18:31:07 +03:00
Max Petrov
dfe77591d6
Merge branch 'master' into fix/4102-gayeway-synced-save-adjustments 2024-08-02 18:22:01 +03:00
Chantsova Ekaterina
a9b350ff76 UI: date-time period component redesign 2024-08-02 17:54:56 +03:00
mpetrov
9a239f2c2e isCisConnectorSynced adjustments 2024-08-02 17:51:13 +03:00
mpetrov
779cfea5ca Added gateway connectors synced save adjustments 2024-08-02 17:16:37 +03:00
Chantsova Ekaterina
c8d48521fb UI: timezone displaying refactoring 2024-08-02 13:47:50 +03:00
Chantsova Ekaterina
7be52df6f5 UI: fix timezone displaying on quick-interval-only 2024-08-02 13:23:44 +03:00
Artem Dzhereleiko
4b00ef6052 UI: Refactoring 2024-08-02 12:37:22 +03:00
mpetrov
d203d819f8 small typing adjustment 2024-08-01 15:28:49 +03:00