diff --git a/application/build.gradle b/application/build.gradle index 1d8a526fd1..01761692f2 100644 --- a/application/build.gradle +++ b/application/build.gradle @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import org.apache.tools.ant.filters.ReplaceTokens buildscript { diff --git a/application/pom.xml b/application/pom.xml index e5a4a4e614..3681bd42db 100644 --- a/application/pom.xml +++ b/application/pom.xml @@ -1,6 +1,6 @@ - - -
- diff --git a/ui/src/app/dashboard/dashboard.controller.js b/ui/src/app/dashboard/dashboard.controller.js index d4d3a1c939..f672f3f03b 100644 --- a/ui/src/app/dashboard/dashboard.controller.js +++ b/ui/src/app/dashboard/dashboard.controller.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/src/app/dashboard/dashboard.directive.js b/ui/src/app/dashboard/dashboard.directive.js index 39b1c02125..8f042856eb 100644 --- a/ui/src/app/dashboard/dashboard.directive.js +++ b/ui/src/app/dashboard/dashboard.directive.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/src/app/dashboard/dashboard.routes.js b/ui/src/app/dashboard/dashboard.routes.js index 92bb36220f..ccb43c708f 100644 --- a/ui/src/app/dashboard/dashboard.routes.js +++ b/ui/src/app/dashboard/dashboard.routes.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/ui/src/app/dashboard/dashboard.scss b/ui/src/app/dashboard/dashboard.scss index daae8ecfc3..224dcf7e4a 100644 --- a/ui/src/app/dashboard/dashboard.scss +++ b/ui/src/app/dashboard/dashboard.scss @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - @import "~compass-sass-mixins/lib/compass"; @import '../../scss/constants'; diff --git a/ui/src/app/dashboard/dashboard.tpl.html b/ui/src/app/dashboard/dashboard.tpl.html index fab46346da..9626509a51 100644 --- a/ui/src/app/dashboard/dashboard.tpl.html +++ b/ui/src/app/dashboard/dashboard.tpl.html @@ -1,6 +1,6 @@ -
diff --git a/ui/src/app/entity/alias/aliases-entity-select-panel.controller.js b/ui/src/app/entity/alias/aliases-entity-select-panel.controller.js index 90248b2d57..6ff7863964 100644 --- a/ui/src/app/entity/alias/aliases-entity-select-panel.controller.js +++ b/ui/src/app/entity/alias/aliases-entity-select-panel.controller.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /*@ngInject*/ export default function AliasesEntitySelectPanelController(mdPanelRef, $scope, $filter, types, aliasController, onEntityAliasesUpdate) { diff --git a/ui/src/app/entity/alias/aliases-entity-select-panel.tpl.html b/ui/src/app/entity/alias/aliases-entity-select-panel.tpl.html index d197d0bd9c..bfce77cf6a 100644 --- a/ui/src/app/entity/alias/aliases-entity-select-panel.tpl.html +++ b/ui/src/app/entity/alias/aliases-entity-select-panel.tpl.html @@ -1,6 +1,6 @@ -
alias.no-entity-filter-specified
diff --git a/ui/src/app/entity/entity-filter.directive.js b/ui/src/app/entity/entity-filter.directive.js index 3cede93b39..0c8f6468f0 100644 --- a/ui/src/app/entity/entity-filter.directive.js +++ b/ui/src/app/entity/entity-filter.directive.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /* eslint-disable import/no-unresolved, import/default */ import entityFilterTemplate from './entity-filter.tpl.html'; diff --git a/ui/src/app/entity/entity-filter.scss b/ui/src/app/entity/entity-filter.scss index 7e998ca674..bbaa108e09 100644 --- a/ui/src/app/entity/entity-filter.scss +++ b/ui/src/app/entity/entity-filter.scss @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - .tb-entity-filter { #relationsQueryFilter { diff --git a/ui/src/app/entity/entity-filter.tpl.html b/ui/src/app/entity/entity-filter.tpl.html index 0e8ee1177b..f9aac3cb78 100644 --- a/ui/src/app/entity/entity-filter.tpl.html +++ b/ui/src/app/entity/entity-filter.tpl.html @@ -1,6 +1,6 @@ -
-
-
-
-
diff --git a/ui/src/app/url.handler.js b/ui/src/app/url.handler.js index cc443ff2f2..bf6dfb636d 100644 --- a/ui/src/app/url.handler.js +++ b/ui/src/app/url.handler.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - export default function UrlHandler($injector, $location) { var userService = $injector.get('userService'); if (userService.isUserLoaded() === true) { diff --git a/ui/src/app/user/activation-link.controller.js b/ui/src/app/user/activation-link.controller.js index 9fb76c54f4..ac0fb7967f 100644 --- a/ui/src/app/user/activation-link.controller.js +++ b/ui/src/app/user/activation-link.controller.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - /*@ngInject*/ export default function ActivationLinkDialogController($mdDialog, $translate, toast, activationLink) { diff --git a/ui/src/app/user/activation-link.dialog.tpl.html b/ui/src/app/user/activation-link.dialog.tpl.html index 3f55d1d446..c63d74cbc8 100644 --- a/ui/src/app/user/activation-link.dialog.tpl.html +++ b/ui/src/app/user/activation-link.dialog.tpl.html @@ -1,6 +1,6 @@ -
diff --git a/ui/src/app/widget/lib/rpc/led-indicator.directive.js b/ui/src/app/widget/lib/rpc/led-indicator.directive.js index ac0658c75b..51ab2d3b32 100644 --- a/ui/src/app/widget/lib/rpc/led-indicator.directive.js +++ b/ui/src/app/widget/lib/rpc/led-indicator.directive.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import './led-indicator.scss'; import tinycolor from 'tinycolor2'; diff --git a/ui/src/app/widget/lib/rpc/led-indicator.scss b/ui/src/app/widget/lib/rpc/led-indicator.scss index d086a101d6..9b68c42253 100644 --- a/ui/src/app/widget/lib/rpc/led-indicator.scss +++ b/ui/src/app/widget/lib/rpc/led-indicator.scss @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - @import "~compass-sass-mixins/lib/compass"; $error-height: 14px; diff --git a/ui/src/app/widget/lib/rpc/led-indicator.tpl.html b/ui/src/app/widget/lib/rpc/led-indicator.tpl.html index a092f42dea..383ca25eb9 100644 --- a/ui/src/app/widget/lib/rpc/led-indicator.tpl.html +++ b/ui/src/app/widget/lib/rpc/led-indicator.tpl.html @@ -1,6 +1,6 @@ -
diff --git a/ui/src/app/widget/lib/tencent-map.js b/ui/src/app/widget/lib/tencent-map.js index 27a87cab59..e0a9c5cbe7 100644 --- a/ui/src/app/widget/lib/tencent-map.js +++ b/ui/src/app/widget/lib/tencent-map.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - var tmGlobals = { loadingTmId: null, tmApiKeys: {} diff --git a/ui/src/app/widget/lib/timeseries-table-widget.js b/ui/src/app/widget/lib/timeseries-table-widget.js index 28ac811f1b..684bbde1e3 100644 --- a/ui/src/app/widget/lib/timeseries-table-widget.js +++ b/ui/src/app/widget/lib/timeseries-table-widget.js @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - import './timeseries-table-widget.scss'; /* eslint-disable import/no-unresolved, import/default */ diff --git a/ui/src/app/widget/lib/timeseries-table-widget.scss b/ui/src/app/widget/lib/timeseries-table-widget.scss index da3ee81644..cd8f8a9dad 100644 --- a/ui/src/app/widget/lib/timeseries-table-widget.scss +++ b/ui/src/app/widget/lib/timeseries-table-widget.scss @@ -1,5 +1,5 @@ /** - * Copyright © 2016-2017 The Thingsboard Authors + * Copyright © 2016-2018 The Thingsboard Authors * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,7 +13,6 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - tb-timeseries-table-widget { table.md-table thead.md-head>tr.md-row { height: 40px; diff --git a/ui/src/app/widget/lib/timeseries-table-widget.tpl.html b/ui/src/app/widget/lib/timeseries-table-widget.tpl.html index 349edbac5e..eb9b8caa75 100644 --- a/ui/src/app/widget/lib/timeseries-table-widget.tpl.html +++ b/ui/src/app/widget/lib/timeseries-table-widget.tpl.html @@ -1,6 +1,6 @@