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

Support opening and comparing versions in viewer #39171

Merged
merged 2 commits into from
Aug 8, 2023

Conversation

artonge
Copy link
Contributor

@artonge artonge commented Jul 5, 2023

Fix #39139
Fix #39140

Tests will be added in text as there is no default viewer handler that covers version comparison support for now

Screenshots

Clicking the version just opens a single preview

Screenshot 2023-08-03 at 15 29 51

Comparing menu

  • Comparing is available for any but the current version
    Screenshot 2023-08-03 at 15 27 46

  • Clicking it will compare the picked with the current version
    Screenshot 2023-08-03 at 15 27 50

Todo

@artonge artonge self-assigned this Jul 5, 2023
@artonge artonge added this to the Nextcloud 28 milestone Jul 5, 2023
@artonge artonge force-pushed the artonge/feat/allow_to_open_versions_in_viewer branch from b26cb7c to 81ce076 Compare July 6, 2023 15:02
@artonge artonge force-pushed the artonge/feat/allow_to_open_versions_in_viewer branch from 81ce076 to c148c5a Compare July 13, 2023 16:16
@juliusknorr juliusknorr force-pushed the artonge/feat/allow_to_open_versions_in_viewer branch from c148c5a to 64c5835 Compare August 3, 2023 13:14
@juliusknorr juliusknorr changed the title Support opening versions in viewer Support opening and comparing versions in viewer Aug 3, 2023
@juliusknorr juliusknorr force-pushed the artonge/feat/allow_to_open_versions_in_viewer branch from 397567d to 81d89f1 Compare August 4, 2023 07:41
@juliusknorr juliusknorr marked this pull request as ready for review August 7, 2023 08:19
@juliusknorr juliusknorr force-pushed the artonge/feat/allow_to_open_versions_in_viewer branch from 81d89f1 to 4611ce2 Compare August 7, 2023 08:19
@juliusknorr juliusknorr force-pushed the artonge/feat/allow_to_open_versions_in_viewer branch from 4611ce2 to 92d7b38 Compare August 7, 2023 10:34
@juliusknorr juliusknorr requested review from max-nextcloud, a team, susnux, nfebe and Pytal and removed request for a team August 7, 2023 17:18
@juliusknorr juliusknorr added 3. to review Waiting for reviews and removed 2. developing Work in progress labels Aug 7, 2023
@juliusknorr juliusknorr force-pushed the artonge/feat/allow_to_open_versions_in_viewer branch from 92d7b38 to 872843c Compare August 8, 2023 14:29
@juliusknorr
Copy link
Member

/compile

@juliusknorr juliusknorr added 4. to release Ready to be released and/or waiting for tests to finish and removed 3. to review Waiting for reviews labels Aug 8, 2023
Signed-off-by: Louis Chemineau <louis@chmn.me>
@juliusknorr juliusknorr force-pushed the artonge/feat/allow_to_open_versions_in_viewer branch from c7d8439 to 5902325 Compare August 8, 2023 19:19
@juliusknorr
Copy link
Member

/compile

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@juliusknorr juliusknorr merged commit 780ece0 into master Aug 8, 2023
37 checks passed
@juliusknorr juliusknorr deleted the artonge/feat/allow_to_open_versions_in_viewer branch August 8, 2023 20:25
@juliusknorr
Copy link
Member

/backport 5902325 to stable27

@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

@AndyScherzinger
Copy link
Member

/backport 5902325 to stable27

@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

@AndyScherzinger
Copy link
Member

Backport bot is no friend of mine nor of @juliushaertl 😭

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish enhancement javascript
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Compare 2 versions of a file Open versions of a file by clicking on the version list item
6 participants