Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
frenck committed Aug 6, 2024
2 parents 735560c + 5eae163 commit f08f455
Show file tree
Hide file tree
Showing 10 changed files with 1,098 additions and 1,040 deletions.
894 changes: 0 additions & 894 deletions .yarn/releases/yarn-4.3.1.cjs

This file was deleted.

925 changes: 925 additions & 0 deletions .yarn/releases/yarn-4.4.0.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ enableGlobalCache: false

nodeLinker: node-modules

yarnPath: .yarn/releases/yarn-4.3.1.cjs
yarnPath: .yarn/releases/yarn-4.4.0.cjs
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,8 @@
"@polymer/paper-tabs": "3.1.0",
"@polymer/polymer": "3.5.1",
"@thomasloven/round-slider": "0.6.0",
"@vaadin/combo-box": "24.4.4",
"@vaadin/vaadin-themable-mixin": "24.4.4",
"@vaadin/combo-box": "24.4.5",
"@vaadin/vaadin-themable-mixin": "24.4.5",
"@vibrant/color": "3.2.1-alpha.1",
"@vibrant/core": "3.2.1-alpha.1",
"@vibrant/quantizer-mmcq": "3.2.1-alpha.1",
Expand Down Expand Up @@ -216,7 +216,7 @@
"husky": "9.1.4",
"instant-mocha": "1.5.2",
"jszip": "3.10.1",
"lint-staged": "15.2.7",
"lint-staged": "15.2.8",
"lit-analyzer": "2.0.3",
"lodash.merge": "4.6.2",
"lodash.template": "4.5.0",
Expand Down Expand Up @@ -258,5 +258,5 @@
"[email protected]": "patch:sortablejs@npm%3A1.15.2#~/.yarn/patches/sortablejs-npm-1.15.2-73347ae85a.patch",
"[email protected]": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch"
},
"packageManager": "yarn@4.3.1"
"packageManager": "yarn@4.4.0"
}
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "home-assistant-frontend"
version = "20240805.1"
version = "20240806.0"
license = {text = "Apache-2.0"}
description = "The Home Assistant frontend"
readme = "README.md"
Expand Down
7 changes: 3 additions & 4 deletions renovate.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@
{
"description": "Group tsparticles engine and presets",
"groupName": "tsparticles",
"matchPackageNames": ["tsparticles-engine"],
"matchPackagePrefixes": ["tsparticles-preset-"]
"matchPackageNames": ["tsparticles-engine", "tsparticles-preset-{/,}**"]
},
{
"description": "Group date-fns with dependent timezone package",
Expand All @@ -48,8 +47,8 @@
{
"description": "Group and temporarily disable WDS packages",
"groupName": "Web Dev Server",
"matchPackagePrefixes": ["@web/dev-server"],
"enabled": false
"enabled": false,
"matchPackageNames": ["@web/dev-server{/,}**"]
}
]
}
4 changes: 3 additions & 1 deletion src/data/automation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,9 @@ export const normalizeAutomationConfig = <
}
}

config.action = migrateAutomationAction(config.action || []);
if (config.action) {
config.action = migrateAutomationAction(config.action);
}

return config;
};
Expand Down
4 changes: 2 additions & 2 deletions src/panels/lovelace/badges/hui-view-badges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ export class HuiViewBadges extends LitElement {
class="add"
@click=${this._addBadge}
aria-label=${this.hass.localize(
"ui.panel.lovelace.editor.section.add_card"
"ui.panel.lovelace.editor.section.add_badge"
)}
.title=${this.hass.localize(
"ui.panel.lovelace.editor.section.add_card"
"ui.panel.lovelace.editor.section.add_badge"
)}
>
<ha-svg-icon .path=${mdiPlus}></ha-svg-icon>
Expand Down
1 change: 1 addition & 0 deletions src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -5626,6 +5626,7 @@
},
"section": {
"unnamed_section": "Unnamed section",
"add_badge": "Add badge",
"add_card": "[%key:ui::panel::lovelace::editor::edit_card::add%]",
"create_section": "Create section"
},
Expand Down
Loading

0 comments on commit f08f455

Please sign in to comment.