Skip to content

Commit 09bcae1

Browse files
committed
Merge branch 'release/1.4.0'
2 parents a8320c1 + 37153c2 commit 09bcae1

File tree

4 files changed

+8
-3
lines changed

4 files changed

+8
-3
lines changed

.github/workflows/itkdev_docker_build_develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
file: ./infrastructure/itkdev/Dockerfile
4545
build-args: |
4646
APP_VERSION=${{ github.ref }}
47-
APP_RELEASE_VERSION=$GITHUB_REF_NAME
47+
APP_RELEASE_VERSION=${{ env.APP_VERSION }}
4848
APP_RELEASE_TIMESTAMP=${{ env.APP_RELEASE_TIMESTAMP }}
4949
APP_RELEASE_TIME=${{ env.APP_RELEASE_TIME }}
5050
push: true

.github/workflows/os2display_docker_build_develop.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
file: ./infrastructure/os2display/Dockerfile
4545
build-args: |
4646
APP_VERSION=${{ github.ref }}
47-
APP_RELEASE_VERSION=$GITHUB_REF_NAME
47+
APP_RELEASE_VERSION=${{ env.APP_VERSION }}
4848
APP_RELEASE_TIMESTAMP=${{ env.APP_RELEASE_TIMESTAMP }}
4949
APP_RELEASE_TIME=${{ env.APP_RELEASE_TIME }}
5050
push: true

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
44

55
## [Unreleased]
66

7+
## [1.4.0] - 2023-09-14
8+
9+
- [#210](https://github.com/os2display/display-admin-client/pull/210)
10+
Use thumbnails for media list if they are set
11+
712
## [1.3.3] - 2023-07-11
813

914
- [#208](https://github.com/os2display/display-admin-client/pull/208)

src/components/media/image-list.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ function ImageList({ media, multiple }) {
5252
onClick={() => selectImage(data)}
5353
>
5454
<img
55-
src={data.assets.uri}
55+
src={data.thumbnail ?? data.assets.uri}
5656
className="card-img-top"
5757
alt={data.description}
5858
/>

0 commit comments

Comments
 (0)