Merge branch 'master' into ocis-1715-lighter-runtime

This commit is contained in:
A.Unger
2021-03-11 13:00:22 +01:00
9 changed files with 87 additions and 62 deletions

View File

@@ -7,7 +7,9 @@ The following sections list the changes for unreleased.
## Summary
* Bugfix - Fix thumbnail generation for jpegs: [#1490](https://github.com/owncloud/ocis/issues/1490)
* Enhancement - Add focus to input elements on login page: [#1792](https://github.com/owncloud/ocis/pull/1792)
* Enhancement - Clarify expected failures: [#1790](https://github.com/owncloud/ocis/pull/1790)
* Enhancement - Generate thumbnails for .gif files: [#1791](https://github.com/owncloud/ocis/pull/1791)
## Details
@@ -18,6 +20,11 @@ The following sections list the changes for unreleased.
https://github.com/owncloud/ocis/issues/1490
https://github.com/owncloud/ocis/pull/1785
* Enhancement - Add focus to input elements on login page: [#1792](https://github.com/owncloud/ocis/pull/1792)
https://github.com/owncloud/web/issues/4322
https://github.com/owncloud/ocis/pull/1792
* Enhancement - Clarify expected failures: [#1790](https://github.com/owncloud/ocis/pull/1790)
Some features, while covered by the ownCloud 10 acceptance tests, will not be implmented for
@@ -31,6 +38,12 @@ The following sections list the changes for unreleased.
https://github.com/owncloud/ocis/issues/214
https://github.com/owncloud/ocis/pull/1790
https://github.com/owncloud/client/pull/8398
* Enhancement - Generate thumbnails for .gif files: [#1791](https://github.com/owncloud/ocis/pull/1791)
Added support for gifs to the thumbnails service.
https://github.com/owncloud/ocis/pull/1791
# Changelog for [1.3.0] (2021-03-09)
The following sections list the changes for 1.3.0.

View File

@@ -0,0 +1,4 @@
Enhancement: Add focus to input elements on login page
https://github.com/owncloud/ocis/pull/1792
https://github.com/owncloud/web/issues/4322

View File

@@ -0,0 +1,5 @@
Enhancement: Generate thumbnails for .gif files
Added support for gifs to the thumbnails service.
https://github.com/owncloud/ocis/pull/1791

View File

@@ -30,7 +30,7 @@ make generate
make build
{{< / highlight >}}
After building you have the binary within the `bin/` folder. Try to run it: `./bin/ocis -h`
After building you have the binary within the `bin/` folder. Try to run it: `./bin/ocis h`
## Build a local oCIS docker image

File diff suppressed because one or more lines are too long

View File

@@ -55,6 +55,7 @@ strong {
.oc-input:focus {
outline: none;
border: 1px solid #fff;
}
.oc-input::placeholder {

View File

@@ -19,7 +19,6 @@ Other free text and markdown formatting can be used elsewhere in the document if
### [Media Viewer preview not visible for files with .jpeg, .ogg, .webm and .gif formats](https://github.com/owncloud/ocis/issues/1490)
- [webUIPreview/imageMediaViewer.feature:136](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPreview/imageMediaViewer.feature#L136)
- [webUIPreview/imageMediaViewer.feature:145](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPreview/imageMediaViewer.feature#L145)
- [webUIPreview/imageMediaViewer.feature:154](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIPreview/imageMediaViewer.feature#L154)
### [Media viewer previews are not visible in public share](https://github.com/owncloud/ocis/issues/1370)

View File

@@ -5,6 +5,9 @@ import (
"crypto/tls"
"fmt"
"image"
_ "image/gif" // Import the gif package so that image.Decode can understand gifs
_ "image/jpeg" // Import the jpeg package so that image.Decode can understand jpegs
_ "image/png" // Import the png package so that image.Decode can understand pngs
"net/http"
"net/url"
"path"

View File

@@ -95,7 +95,7 @@ func extensionToFiletype(ext string) thumbnails.GetRequest_FileType {
case "JPG", "PNG":
val := thumbnails.GetRequest_FileType_value[ext]
return thumbnails.GetRequest_FileType(val)
case "JPEG":
case "JPEG", "GIF":
val := thumbnails.GetRequest_FileType_value["JPG"]
return thumbnails.GetRequest_FileType(val)
default: