Browse Source
# Conflicts: # application/src/main/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcSession.java # application/src/main/java/org/thingsboard/server/service/edge/rpc/KafkaEdgeGrpcSession.java # application/src/main/java/org/thingsboard/server/service/edge/rpc/PostgresEdgeGrpcSession.java # application/src/main/java/org/thingsboard/server/service/edge/rpc/service/EdgeGrpcService.java # application/src/main/java/org/thingsboard/server/service/edge/rpc/session/EdgeAttributeSaveCallback.java # application/src/test/java/org/thingsboard/server/service/edge/rpc/EdgeGrpcServiceTest.java # application/src/test/java/org/thingsboard/server/service/edge/rpc/session/manager/KafkaBasedEdgeGrpcSessionManagerTest.java # common/data/src/main/java/org/thingsboard/server/common/data/query/ComplexOperation.java # packaging/js/build.gradle # ui-ngx/src/app/modules/home/components/filter/filter-dialog.component.ts # ui-ngx/src/app/modules/home/components/filter/filter-predicate-list.component.scss # ui-ngx/src/app/modules/home/components/filter/filter-predicate.component.ts # ui-ngx/src/app/modules/home/components/filter/filter-text.component.ts # ui-ngx/src/app/modules/home/components/filter/filters-dialog.component.ts # ui-ngx/src/app/modules/home/components/filter/key-filter-list.component.scss # ui-ngx/src/app/modules/home/components/filter/key-filter-list.component.ts # ui-ngx/src/app/modules/home/components/filter/user-filter-dialog.component.ts # ui-ngx/src/app/modules/home/components/github-badge/github-badge.component.ts # ui-ngx/src/app/modules/home/components/widget/lib/chart/time-series-chart.ts # ui-ngx/src/app/modules/home/home.component.scss # ui-ngx/src/app/modules/home/home.component.ts # ui-ngx/src/app/modules/home/menu/menu-link.component.scss # ui-ngx/src/app/modules/home/menu/menu-link.component.ts # ui-ngx/src/app/modules/home/menu/menu-toggle.component.ts # ui-ngx/src/app/modules/home/menu/side-menu.component.scss # ui-ngx/src/app/modules/home/menu/side-menu.component.ts # ui-ngx/src/app/modules/home/pages/home-links/home-links.component.ts # ui-ngx/src/app/modules/home/pages/rulechain/rule-note-editor.component.scss # ui-ngx/src/app/shared/components/breadcrumb.component.ts # ui-ngx/src/app/shared/components/user-menu.component.scss # ui-ngx/src/app/shared/components/user-menu.component.tspull/16130/head
8270 changed files with 16745 additions and 123440 deletions
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue