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

Re add the uploaded file list to file drops #13286

Merged
merged 4 commits into from
Jan 4, 2019

Conversation

weeman1337
Copy link
Member

  • Re add the ul element - now with an id, so it's clear why it is there
  • Tiny layout tweaks
    • Remove a lost '
    • Improve the icon position

image

Closes #13226

@weeman1337 weeman1337 added the bug label Dec 29, 2018
@weeman1337 weeman1337 self-assigned this Dec 29, 2018
@JSoko
Copy link
Member

JSoko commented Dec 29, 2018

Thank You,

now the Filenames are shown again, but in front of the neme there ist a '
grafik

@weeman1337
Copy link
Member Author

@JSoko I found and removed that one in the code. It doesn't appear for me...
Could you please clear your caches and try again?

@JSoko
Copy link
Member

JSoko commented Dec 29, 2018

@JSoko I found and removed that one in the code. It doesn't appear for me...
Could you please clear your caches and try again?

I did your changes, clearde the caches and rebooted the vm, but the ' ist still there...
grafik
grafik

@weeman1337
Copy link
Member Author

@JSoko the changes are in apps/files_sharing/js/templates.js and pps/files_sharing/js/templates.js. The one is the compiled template. Please double check that.

I think the important cache here is the browser cache. Since the templates are compiled client side..

Copy link
Member

@violoncelloCH violoncelloCH left a comment

Choose a reason for hiding this comment

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

tested and works! 👍

@violoncelloCH
Copy link
Member

/backport to stable15

@violoncelloCH violoncelloCH added this to the Nextcloud 15.0.1 milestone Dec 29, 2018
@weeman1337 weeman1337 added the 3. to review Waiting for reviews label Dec 29, 2018
@JSoko JSoko self-requested a review December 30, 2018 09:37
@JSoko
Copy link
Member

JSoko commented Dec 30, 2018

apps/files_sharing/js/templates.js

Reuploaded this changed file and now it works! Thank You!

Copy link
Member

@JSoko JSoko left a comment

Choose a reason for hiding this comment

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

Works well!

Copy link
Member

@juliusknorr juliusknorr left a comment

Choose a reason for hiding this comment

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

Really nice 👍

@juliusknorr juliusknorr force-pushed the bug/13226/uploaded-files branch from 75cda0c to da9eadc Compare January 4, 2019 10:28
@juliusknorr
Copy link
Member

Rebased to re-run ci.

@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 Jan 4, 2019
@juliusknorr juliusknorr merged commit d9c3d2f into master Jan 4, 2019
@juliusknorr juliusknorr deleted the bug/13226/uploaded-files branch January 4, 2019 12:22
@backportbot-nextcloud
Copy link

backport to stable15 in #13355

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 bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants