Skip to content

Commit 664e9d4

Browse files
nielslyngsoenielslyngsoe
committed
Merge branch 'v1/contrib' of https://github.com/umbraco/Umbraco.UI into v1/feature/new-icons-correction
# Conflicts: # packages/uui-icon-registry-essential/lib/svgs/iconAdd.ts # packages/uui-icon-registry-essential/lib/svgs/iconAlert.ts # packages/uui-icon-registry-essential/lib/svgs/iconAttachment.ts # packages/uui-icon-registry-essential/lib/svgs/iconCalendar.ts # packages/uui-icon-registry-essential/lib/svgs/iconCheck.ts # packages/uui-icon-registry-essential/lib/svgs/iconClipboard.ts # packages/uui-icon-registry-essential/lib/svgs/iconCode.ts # packages/uui-icon-registry-essential/lib/svgs/iconColorPicker.ts # packages/uui-icon-registry-essential/lib/svgs/iconCopy.ts # packages/uui-icon-registry-essential/lib/svgs/iconDelete.ts # packages/uui-icon-registry-essential/lib/svgs/iconDocument.ts # packages/uui-icon-registry-essential/lib/svgs/iconDownload.ts # packages/uui-icon-registry-essential/lib/svgs/iconEdit.ts # packages/uui-icon-registry-essential/lib/svgs/iconFavorite.ts # packages/uui-icon-registry-essential/lib/svgs/iconFolder.ts # packages/uui-icon-registry-essential/lib/svgs/iconForbidden.ts # packages/uui-icon-registry-essential/lib/svgs/iconInfo.ts # packages/uui-icon-registry-essential/lib/svgs/iconLink.ts # packages/uui-icon-registry-essential/lib/svgs/iconLock.ts # packages/uui-icon-registry-essential/lib/svgs/iconPause.ts # packages/uui-icon-registry-essential/lib/svgs/iconPicture.ts # packages/uui-icon-registry-essential/lib/svgs/iconPlay.ts # packages/uui-icon-registry-essential/lib/svgs/iconRemove.ts # packages/uui-icon-registry-essential/lib/svgs/iconSearch.ts # packages/uui-icon-registry-essential/lib/svgs/iconSee.ts # packages/uui-icon-registry-essential/lib/svgs/iconSettings.ts # packages/uui-icon-registry-essential/lib/svgs/iconSubtract.ts # packages/uui-icon-registry-essential/lib/svgs/iconSync.ts # packages/uui-icon-registry-essential/lib/svgs/iconUnlock.ts # packages/uui-icon-registry-essential/lib/svgs/iconUnsee.ts # packages/uui-icon-registry-essential/lib/svgs/iconWand.ts # packages/uui-icon-registry-essential/lib/svgs/iconWrong.ts
2 parents 2ea7553 + 7045d1b commit 664e9d4

File tree

179 files changed

+1950
-1035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+1950
-1035
lines changed

‎.github/pull_request_template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@
2626
<!--- Go over all the following points, and put an `x` in all the boxes that apply. If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
2727

2828
- [ ] If my change requires a change to the documentation, I have updated the documentation in this pull request.
29-
- [ ] I have read the **[CONTRIBUTING](<(https://github.com/umbraco/Umbraco.UI/blob/dev/docs/CONTRIBUTING.md)>)** document.
29+
- [ ] I have read the **[CONTRIBUTING](<(https://github.com/umbraco/Umbraco.UI/blob/v1/contrib/docs/CONTRIBUTING.md)>)** document.
3030
- [ ] I have added tests to cover my changes.

‎.github/release.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@ changelog:
2929
- title: 📦 Dependencies
3030
labels:
3131
- dependencies
32+
- title: 🌈 A11Y
33+
labels:
34+
- accessibility
3235
- title: Other Changes
3336
labels:
3437
- '*'

‎.github/workflows/chromatic.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,10 +48,10 @@ jobs:
4848
with:
4949
# pulls all commits (needed for chromatic to find baselines)
5050
fetch-depth: '0'
51-
- name: Use Node.js 18.x
51+
- name: Use Node.js 20
5252
uses: actions/setup-node@v4
5353
with:
54-
node-version: 18.x
54+
node-version: 20
5555
cache: 'npm'
5656
- name: Install dependencies
5757
run: npm ci

‎.github/workflows/publish.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
# pulls all commits (needed for lerna / semantic release to correctly version)
3333
fetch-depth: '0'
3434

35-
- name: Use Node.js 18.x
35+
- name: Use Node.js 20
3636
uses: actions/setup-node@v4
3737
with:
38-
node-version: 18.x
38+
node-version: 20
3939
cache: 'npm'
4040

4141
- run: npm -v

‎.github/workflows/tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
node-version: [18.x]
23+
node-version: [20]
2424

2525
steps:
2626
- uses: actions/checkout@v4
@@ -39,7 +39,7 @@ jobs:
3939

4040
strategy:
4141
matrix:
42-
node-version: [18.x]
42+
node-version: [20]
4343

4444
steps:
4545
- uses: actions/checkout@v4

‎.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.16
1+
20.9

‎CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [1.5.0](https://github.com/umbraco/Umbraco.UI/compare/v1.5.0-rc.3...v1.5.0) (2023-10-30)
7+
8+
**Note:** Version bump only for package uui-monorepo
9+
10+
# [1.5.0-rc.3](https://github.com/umbraco/Umbraco.UI/compare/v1.5.0-rc.2...v1.5.0-rc.3) (2023-10-18)
11+
12+
**Note:** Version bump only for package uui-monorepo
13+
614
# [1.5.0-rc.2](https://github.com/umbraco/Umbraco.UI/compare/v1.5.0-rc.1...v1.5.0-rc.2) (2023-10-18)
715

816
**Note:** Version bump only for package uui-monorepo

‎lerna.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"packages": ["packages/*"],
3-
"version": "1.5.0-rc.2",
3+
"version": "1.5.0",
44
"npmClient": "npm",
55
"useWorkspaces": true,
66
"command": {

0 commit comments

Comments
 (0)