Merge pull request #1880 from owncloud/release-1.4.0

merge back release 1.4.0
owncloud · Mar 31, 2021 · 89da2b0 · 89da2b0
2 parents 14c0371 + 1ba10d9
commit 89da2b0
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 2 deletions.
diff --git a/...nreleased/add-focus-to-inputs-on-login.md → ...021-03-30/add-focus-to-inputs-on-login.md b/...nreleased/add-focus-to-inputs-on-login.md → ...021-03-30/add-focus-to-inputs-on-login.md
diff --git a/...d-labels-and-aria-labelled-by-on-login.md → ...d-labels-and-aria-labelled-by-on-login.md b/...d-labels-and-aria-labelled-by-on-login.md → ...d-labels-and-aria-labelled-by-on-login.md
diff --git a/changelog/unreleased/build-all-targets.md → ...log/1.4.0_2021-03-30/build-all-targets.md b/changelog/unreleased/build-all-targets.md → ...log/1.4.0_2021-03-30/build-all-targets.md
diff --git a/...g/unreleased/clarify-expected-failures.md → ...0_2021-03-30/clarify-expected-failures.md b/...g/unreleased/clarify-expected-failures.md → ...0_2021-03-30/clarify-expected-failures.md
diff --git a/...ed/enhancement-adjust-login-page-title.md → ...30/enhancement-adjust-login-page-title.md b/...ed/enhancement-adjust-login-page-title.md → ...30/enhancement-adjust-login-page-title.md
diff --git a/changelog/unreleased/fix-jpeg-thumbnails.md → ...g/1.4.0_2021-03-30/fix-jpeg-thumbnails.md b/changelog/unreleased/fix-jpeg-thumbnails.md → ...g/1.4.0_2021-03-30/fix-jpeg-thumbnails.md
@@ -2,5 +2,5 @@ Bugfix: Fix thumbnail generation for jpegs
 
 Images with the extension `.jpeg` were not properly supported.
 
-https://github.com/owncloud/ocis/issues/1490
 https://github.com/owncloud/ocis/pull/1785
+https://github.com/owncloud/ocis/issues/1490
diff --git a/changelog/unreleased/logging-to-file.md → ...gelog/1.4.0_2021-03-30/logging-to-file.md b/changelog/unreleased/logging-to-file.md → ...gelog/1.4.0_2021-03-30/logging-to-file.md
diff --git a/...nreleased/runtime-address-configurable.md → ...021-03-30/runtime-address-configurable.md b/...nreleased/runtime-address-configurable.md → ...021-03-30/runtime-address-configurable.md
diff --git a/...log/unreleased/thumbnails-support-gifs.md → ...4.0_2021-03-30/thumbnails-support-gifs.md b/...log/unreleased/thumbnails-support-gifs.md → ...4.0_2021-03-30/thumbnails-support-gifs.md
diff --git a/changelog/unreleased/tracing-refactor.md → ...elog/1.4.0_2021-03-30/tracing-refactor.md b/changelog/unreleased/tracing-refactor.md → ...elog/1.4.0_2021-03-30/tracing-refactor.md
diff --git a/...te-reva-to-e8a00d9b2368-and-go-to-1-16.md → ...te-reva-to-e8a00d9b2368-and-go-to-1-16.md b/...te-reva-to-e8a00d9b2368-and-go-to-1-16.md → ...te-reva-to-e8a00d9b2368-and-go-to-1-16.md
diff --git a/changelog/unreleased/update-web-2.1.0.md → ...elog/1.4.0_2021-03-30/update-web-2.1.0.md b/changelog/unreleased/update-web-2.1.0.md → ...elog/1.4.0_2021-03-30/update-web-2.1.0.md
diff --git a/changelog/TEMPLATE b/changelog/TEMPLATE
@@ -7,5 +7,5 @@ The text in the paragraphs is written in past tense. The last section is a list
 of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID,
 in case there aren't any issue links) is used as the primary ID.
 
-https://github.com/owncloud/ocis/issues/1234
 https://github.com/owncloud/ocis/pull/55555
+https://github.com/owncloud/ocis/issues/1234