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

14179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Maksym Dudnik
ac0c7ed7b2 statistic number data fix 2023-06-09 16:00:32 +03:00
Maksym Dudnik
82c546feb3 Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into gateway_list 
 Conflicts:
	ui-ngx/src/app/modules/common/modules-map.ts
 2023-06-07 12:20:09 +03:00
Maksym Dudnik
d15ec0dc39 hotfix 2023-06-07 11:27:05 +03:00
Igor Kulikov
c6dd11f576 Merge branch 'develop/3.5.2' into feature/basic-widget-config 2023-06-06 18:02:25 +03:00
Igor Kulikov
16afbad9f2
Merge pull request #8638 from ArtemDzhereleiko/AD/imp/rule-chain-selector 
Rule chain selector
 2023-06-06 17:57:57 +03:00
Igor Kulikov
7bca490ae7
Merge pull request #8571 from ArtemDzhereleiko/AD/imp/timeseries-table-widget-column-visability 
Added columns visibility for Timeseries table
 2023-06-06 17:55:29 +03:00
Igor Kulikov
001b23b402
Merge pull request #8587 from vvlladd28/improvement/edit-notification-template 
Added the option to edit notification templates in the template selector
 2023-06-06 17:54:12 +03:00
Igor Kulikov
0fa3040442 Merge branch 'develop/3.5.2' into feature/basic-widget-config 2023-06-06 17:21:18 +03:00
Igor Kulikov
d992355a3c UI: Implement basic config form for Entities table widget. 2023-06-06 17:20:35 +03:00
Andrew Shvayka
d72c841d15
Merge pull request #8676 from dashevchenko/serviceBusQueueFix 
Updated version of azure-servicebus java sdk
 2023-06-06 17:03:21 +03:00
Andrew Shvayka
835f8b48f9
Merge pull request #8706 from imbeacon/fix/swagger-models 
Fixes for models in Swagger
 2023-06-06 16:44:25 +03:00
Maksym Dudnik
1d71e2067f removed action buttons 2023-06-06 14:19:09 +03:00
Maksym Dudnik
c3cb3b4443 Merge branch 'develop/3.5.2' of https://github.com/thingsboard/thingsboard into gateway_list 
 Conflicts:
	ui-ngx/src/app/modules/home/components/widget/lib/settings/widget-settings.module.ts
	ui-ngx/src/app/shared/shared.module.ts
	ui-ngx/src/assets/locale/locale.constant-en_US.json
 2023-06-06 13:31:37 +03:00
Maksym Dudnik
c83667702f Merge remote-tracking branch 'origin/gateway-list' into gateway_list 
# Conflicts:
#	application/src/main/data/json/system/widget_bundles/gateway_widgets.json
 2023-06-06 13:21:40 +03:00
Maksym Dudnik
c9b9959f47 mk2 gateway dashboard 2023-06-06 13:19:53 +03:00
Igor Kulikov
c71d29c507 UI: Entities table basic widget config. 2023-06-05 19:52:34 +03:00
Artem Dzhereleiko
1f6e0e8271 UI: Refactoring 2023-06-05 15:26:48 +03:00
Artem Dzhereleiko
df9026e2df Merge remote-tracking branch 'upstream/develop/3.5.2' into AD/imp/rule-chain-selector 2023-06-05 15:14:46 +03:00
Artem Dzhereleiko
3df0d80242 Merge remote-tracking branch 'upstream/master' into AD/imp/rule-chain-selector 2023-06-05 15:05:39 +03:00
Artem Dzhereleiko
86c8ee6bde UI: Refactoring and add support edge rule chains 2023-06-05 15:05:01 +03:00
Igor Kulikov
a033fd6aad
Merge pull request #8708 from thingsboard/feature/widget-config 
Widget configuration improvement + basic widget configuration mode.
 2023-06-05 11:48:03 +03:00
Igor Kulikov
7a342884bf UI: Implement widgets config basic mode. Widgets config minor refactoring. 2023-06-02 19:43:13 +03:00
Igor Kulikov
1fe00ac46a UI: Implement widgets config basic mode. Widgets config minor refactoring. 2023-06-02 19:37:16 +03:00
Igor Kulikov
4ab93c8c52 Merge branch 'develop/3.5.2' into feature/widget-config 2023-06-02 13:15:45 +03:00
dashevchenko
34c8909adf moved servicebus conflicting dependency to exclusions 2023-06-02 13:05:08 +03:00
Andrew Shvayka
f4c63badf5
Merge pull request #8692 from Seraphym-Tuhai/fix_for_ui_tests 
[3.5.2] Fix for UI tests
 2023-06-02 12:53:04 +03:00
Maksym Dudnik
2be23ba39a fixes 2023-06-02 12:16:50 +03:00
Maksym Dudnik
15e08b7919 fixes 2023-06-02 12:04:06 +03:00
Andrew Shvayka
4311b2f030
Merge pull request #8640 from thingsboard/delete_search_text_ce 
Remove deprecated search text field
 2023-06-02 12:01:07 +03:00
Maksym Dudnik
a6d7b46b38 fixes 2023-06-02 11:46:33 +03:00
Maksym Dudnik
ae3bdc1687 fixes 2023-06-02 10:37:14 +03:00
dashevchenko
dadde5535e added dependencies to avoid conflicts 2023-06-01 19:17:23 +03:00
Maksym Dudnik
3c916454c2 fixes 2023-06-01 16:40:00 +03:00
Andrii Shvaika
aecea7d6a5 Removed SearchTextEntity 2023-06-01 16:01:45 +03:00
Andrii Shvaika
8ab5e1a2db Merge remote-tracking branch 'origin/master' into develop/3.5.2 2023-06-01 15:33:58 +03:00
Andrii Shvaika
56338924a1 Remove Additional info from entities that do not have such field 2023-06-01 15:31:58 +03:00
Andrii Shvaika
be41ec8bef Fix minor issues. Merged with develop/3.5.2 2023-06-01 15:10:08 +03:00
Maksym Dudnik
db83e47401 fixes 2023-06-01 13:57:21 +03:00
Maksym Dudnik
b9f9cf494d fixes 2023-06-01 13:24:32 +03:00
Andrii Shvaika
d09dba8fcb Merge remote-tracking branch 'origin/delete_search_text_ce' into develop/3.5.2 2023-06-01 13:04:14 +03:00
Maksym Dudnik
dc63ce47aa fixes 2023-06-01 11:00:42 +03:00
imbeacon
24b82939c3 Fixes for models in Swagger 2023-06-01 10:12:08 +03:00
Seraphym-Tuhai
7116491824 fix ui tests, add alarm assignee tests to suite 2023-05-31 23:29:00 +03:00
Maksym Dudnik
15690ead07 fixes 2023-05-31 13:57:51 +03:00
Igor Kulikov
733dcea36a Update UI help branch 2023-05-31 12:56:50 +03:00
Igor Kulikov
5b08e5d5a3 Update rule nodes UI 2023-05-31 12:54:13 +03:00
dashevchenko
20443a7256 upgraded version for azure-servicebus sdk 2023-05-30 23:00:23 +03:00
Igor Kulikov
eebfb5d0a4 Merge branch 'develop/3.5.2' into feature/widget-config 2023-05-30 18:47:56 +03:00
Igor Kulikov
ceda0f14e6 Merge branch 'master' into develop/3.5.2 2023-05-30 18:47:33 +03:00
Igor Kulikov
a6e2f6aafb Update apache curator version to 5.5.0 2023-05-30 17:43:35 +03:00