Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add fallback when a there is no preview for a version #38467

Merged
merged 2 commits into from May 25, 2023

Conversation

artonge
Copy link
Contributor

@artonge artonge commented May 25, 2023

Fix #37067

Before (Chrome) Before (Firefox) After
Screenshot from 2023-05-25 15-43-15 Screenshot from 2023-05-25 15-43-06 Screenshot from 2023-05-25 15-42-08

@nextcloud/designers Unsure about the new icon. Do you prefer to go with the "After" version, or the "Firefox" one?
No icon could be confusing because the user might think that the file is empty, even though it might not.

@artonge artonge self-assigned this May 25, 2023
@artonge artonge added this to the Nextcloud 28 milestone May 25, 2023
@artonge artonge requested review from a team, susnux, Fenn-CS and Pytal and removed request for a team May 25, 2023 13:41
@artonge artonge force-pushed the artonge/fix/files_versions_preview branch from f3981d8 to 48bf654 Compare May 25, 2023 13:42
Copy link
Contributor

@szaimen szaimen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One small suggestion, apart from that tested and works and LGTM!

@artonge
Copy link
Contributor Author

artonge commented May 25, 2023

/backport to stable27

@artonge
Copy link
Contributor Author

artonge commented May 25, 2023

/backport to stable26

@artonge
Copy link
Contributor Author

artonge commented May 25, 2023

/backport to stable25

Copy link
Member

@nimishavijay nimishavijay left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good call! The "After" version definitely looks better as you said, and agreed with @szaimen that it can be a lighter color :)

@artonge
Copy link
Contributor Author

artonge commented May 25, 2023

/compile amend /

@nextcloud-command nextcloud-command force-pushed the artonge/fix/files_versions_preview branch from ec5c8f9 to 1b3fbb1 Compare May 25, 2023 20:58
Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: Louis Chemineau <louis@chmn.me>
@artonge artonge force-pushed the artonge/fix/files_versions_preview branch from 1b3fbb1 to e8eb8a9 Compare May 25, 2023 21:46
@artonge artonge enabled auto-merge May 25, 2023 22:20
@artonge artonge merged commit fe146a9 into master May 25, 2023
37 checks passed
@artonge artonge deleted the artonge/fix/files_versions_preview branch May 25, 2023 23:14
@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin/stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@artonge
Copy link
Contributor Author

artonge commented May 26, 2023

/backport to stable25

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@solracsf
Copy link
Member

/backport to stable27

@solracsf
Copy link
Member

/backport to stable26

@solracsf
Copy link
Member

/backport to stable25

@backportbot-nextcloud
Copy link

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin/stable26

# Create the new backport branch
git checkout -b fix/foo-stable26

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin/stable25

# Create the new backport branch
git checkout -b fix/foo-stable25

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@backportbot-nextcloud
Copy link

The backport to stable27 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable27
git pull origin/stable27

# Create the new backport branch
git checkout -b fix/foo-stable27

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts. Resolve them.
git cherry-pick abc123

# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable27

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

@solracsf
Copy link
Member

Must be backported manually if needed, it seems 😞

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Versions tab shows broken image for empty files
6 participants