Maksym Dudnik
|
c5a35b1f53
|
6.12 update
|
3 years ago |
|
Maksym Dudnik
|
ac0c7ed7b2
|
statistic number data fix
|
3 years ago |
|
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
|
3 years ago |
|
Maksym Dudnik
|
d15ec0dc39
|
hotfix
|
3 years ago |
Igor Kulikov
|
c6dd11f576
|
Merge branch 'develop/3.5.2' into feature/basic-widget-config
|
3 years ago |
|
Igor Kulikov
|
16afbad9f2
|
Merge pull request #8638 from ArtemDzhereleiko/AD/imp/rule-chain-selector
Rule chain selector
|
3 years ago |
|
Igor Kulikov
|
7bca490ae7
|
Merge pull request #8571 from ArtemDzhereleiko/AD/imp/timeseries-table-widget-column-visability
Added columns visibility for Timeseries table
|
3 years ago |
|
Igor Kulikov
|
001b23b402
|
Merge pull request #8587 from vvlladd28/improvement/edit-notification-template
Added the option to edit notification templates in the template selector
|
3 years ago |
|
Igor Kulikov
|
0fa3040442
|
Merge branch 'develop/3.5.2' into feature/basic-widget-config
|
3 years ago |
|
Igor Kulikov
|
d992355a3c
|
UI: Implement basic config form for Entities table widget.
|
3 years ago |
Andrew Shvayka
|
d72c841d15
|
Merge pull request #8676 from dashevchenko/serviceBusQueueFix
Updated version of azure-servicebus java sdk
|
3 years ago |
|
Andrew Shvayka
|
835f8b48f9
|
Merge pull request #8706 from imbeacon/fix/swagger-models
Fixes for models in Swagger
|
3 years ago |
|
Maksym Dudnik
|
1d71e2067f
|
removed action buttons
|
3 years ago |
|
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
|
3 years ago |
|
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
|
3 years ago |
|
Maksym Dudnik
|
c9b9959f47
|
mk2 gateway dashboard
|
4 years ago |
|
Igor Kulikov
|
c71d29c507
|
UI: Entities table basic widget config.
|
3 years ago |
Artem Dzhereleiko
|
1f6e0e8271
|
UI: Refactoring
|
3 years ago |
|
Artem Dzhereleiko
|
df9026e2df
|
Merge remote-tracking branch 'upstream/develop/3.5.2' into AD/imp/rule-chain-selector
|
3 years ago |
|
Artem Dzhereleiko
|
3df0d80242
|
Merge remote-tracking branch 'upstream/master' into AD/imp/rule-chain-selector
|
3 years ago |
|
Artem Dzhereleiko
|
86c8ee6bde
|
UI: Refactoring and add support edge rule chains
|
3 years ago |
|
Igor Kulikov
|
a033fd6aad
|
Merge pull request #8708 from thingsboard/feature/widget-config
Widget configuration improvement + basic widget configuration mode.
|
3 years ago |
|
Igor Kulikov
|
7a342884bf
|
UI: Implement widgets config basic mode. Widgets config minor refactoring.
|
3 years ago |
|
Igor Kulikov
|
1fe00ac46a
|
UI: Implement widgets config basic mode. Widgets config minor refactoring.
|
3 years ago |
|
Igor Kulikov
|
4ab93c8c52
|
Merge branch 'develop/3.5.2' into feature/widget-config
|
3 years ago |
dashevchenko
|
34c8909adf
|
moved servicebus conflicting dependency to exclusions
|
3 years ago |
|
Andrew Shvayka
|
f4c63badf5
|
Merge pull request #8692 from Seraphym-Tuhai/fix_for_ui_tests
[3.5.2] Fix for UI tests
|
3 years ago |
|
Maksym Dudnik
|
2be23ba39a
|
fixes
|
3 years ago |
|
Maksym Dudnik
|
15e08b7919
|
fixes
|
3 years ago |
|
Andrew Shvayka
|
4311b2f030
|
Merge pull request #8640 from thingsboard/delete_search_text_ce
Remove deprecated search text field
|
3 years ago |
|
Maksym Dudnik
|
a6d7b46b38
|
fixes
|
3 years ago |
|
Maksym Dudnik
|
ae3bdc1687
|
fixes
|
3 years ago |
|
dashevchenko
|
dadde5535e
|
added dependencies to avoid conflicts
|
3 years ago |
|
Maksym Dudnik
|
3c916454c2
|
fixes
|
3 years ago |
|
Andrii Shvaika
|
aecea7d6a5
|
Removed SearchTextEntity
|
3 years ago |
|
Andrii Shvaika
|
8ab5e1a2db
|
Merge remote-tracking branch 'origin/master' into develop/3.5.2
|
3 years ago |
|
Andrii Shvaika
|
56338924a1
|
Remove Additional info from entities that do not have such field
|
3 years ago |
|
Andrii Shvaika
|
be41ec8bef
|
Fix minor issues. Merged with develop/3.5.2
|
3 years ago |
|
Maksym Dudnik
|
db83e47401
|
fixes
|
3 years ago |
|
Maksym Dudnik
|
b9f9cf494d
|
fixes
|
3 years ago |
|
Andrii Shvaika
|
d09dba8fcb
|
Merge remote-tracking branch 'origin/delete_search_text_ce' into develop/3.5.2
|
3 years ago |
|
Maksym Dudnik
|
dc63ce47aa
|
fixes
|
3 years ago |
imbeacon
|
24b82939c3
|
Fixes for models in Swagger
|
3 years ago |
Seraphym-Tuhai
|
7116491824
|
fix ui tests, add alarm assignee tests to suite
|
3 years ago |
|
Maksym Dudnik
|
15690ead07
|
fixes
|
3 years ago |
|
Igor Kulikov
|
733dcea36a
|
Update UI help branch
|
3 years ago |
|
Igor Kulikov
|
5b08e5d5a3
|
Update rule nodes UI
|
3 years ago |
|
dashevchenko
|
20443a7256
|
upgraded version for azure-servicebus sdk
|
3 years ago |
|
Igor Kulikov
|
eebfb5d0a4
|
Merge branch 'develop/3.5.2' into feature/widget-config
|
3 years ago |
|
Igor Kulikov
|
ceda0f14e6
|
Merge branch 'master' into develop/3.5.2
|
3 years ago |
