Browse Source
# Conflicts: # application/src/main/java/org/thingsboard/server/service/cf/ctx/state/HasLatestTs.java # application/src/main/java/org/thingsboard/server/service/security/auth/extractor/AbstractHeaderTokenExtractor.java # application/src/main/java/org/thingsboard/server/service/security/auth/extractor/JwtQueryTokenExtractor.java # application/src/main/java/org/thingsboard/server/service/security/auth/extractor/TokenExtractor.java # application/src/test/java/org/thingsboard/server/service/install/update/DefaultDataUpdateServiceTest.java # application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_16/NoSecLwM2MIntegrationDtlsCidLengthTest.java # application/src/test/java/org/thingsboard/server/transport/lwm2m/security/cid/serverDtlsCidLength_2/PskLwm2mIntegrationDtlsCidLengthTest.java # common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CurrentOwnerDynamicSourceConfiguration.java # common/data/src/main/java/org/thingsboard/server/exception/DataValidationException.java # common/data/src/main/java/org/thingsboard/server/exception/EntitiesLimitExceededException.java # dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java # dao/src/main/java/org/thingsboard/server/dao/pat/ApiKeyDao.java # dao/src/main/java/org/thingsboard/server/dao/service/validator/CalculatedFieldLinkDataValidator.java # dao/src/main/java/org/thingsboard/server/dao/sql/cf/JpaCalculatedFieldLinkDao.java # dao/src/main/java/org/thingsboard/server/dao/sql/pat/ApiKeyInfoRepository.java # dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldLinkDataValidatorTest.java # ui-ngx/src/app/modules/home/components/api-key/api-keys-table-dialog.component.scss # ui-ngx/src/app/modules/home/components/audit-log/audit-log-details-dialog.component.scss # ui-ngx/src/app/modules/home/components/audit-log/audit-log-header.component.scss # ui-ngx/src/app/modules/home/components/calculated-fields/components/calculated-field-arguments/calculated-field-argument-panel.component.ts # ui-ngx/src/app/modules/home/components/calculated-fields/components/debug-dialog/calculated-field-debug-dialog.component.ts # ui-ngx/src/app/modules/home/components/calculated-fields/components/panel/calculated-field-argument-panel.component.html # ui-ngx/src/app/modules/home/components/dashboard-page/dashboard-settings-dialog.component.ts # ui-ngx/src/app/modules/home/components/device/device-credentials-lwm2m.component.ts # ui-ngx/src/app/modules/home/components/event/event-content-dialog.component.scss # ui-ngx/src/app/modules/home/components/profile/tenant/default-tenant-profile-configuration.component.ts # ui-ngx/src/app/modules/home/pages/admin/two-factor-auth-settings.component.ts # ui-ngx/src/app/modules/home/pages/alarm/alarm-routing.module.ts # ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-alarm-rules-unavailable-page.component.html # ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-alarm-rules-unavailable-page.component.scss # ui-ngx/src/app/modules/home/pages/iot-hub/iot-hub-alarm-rules-unavailable-page.component.ts # ui-ngx/src/app/modules/login/login-routing.module.ts # ui-ngx/src/app/modules/login/pages/login/create-password.component.ts # ui-ngx/src/app/modules/login/pages/login/reset-password.component.ts # ui-ngx/src/app/shared/components/entity/entity-key-autocomplete.component.ts # ui-ngx/src/app/shared/components/entity/entity-select.component.ts # ui-ngx/src/app/shared/components/entity/entity-subtype-list.component.ts # ui-ngx/src/app/shared/components/logo.component.scss # ui-ngx/src/app/shared/components/logo.component.ts # ui-ngx/src/app/shared/components/public-api.ts # ui-ngx/src/app/shared/components/string-autocomplete.component.ts # ui-ngx/src/app/shared/components/time-unit-input.component.ts # ui-ngx/src/app/shared/models/calculated-field.models.ts # ui-ngx/src/app/shared/models/two-factor-auth.models.ts # ui-ngx/src/app/shared/models/widget/widget-model.definition.tspull/16129/head
7817 changed files with 15837 additions and 116663 deletions
Some files were not shown because too many files changed in this diff
Loading…
Reference in new issue