Skip to content

Re add the uploaded file list to file drops - #13286

Merged
juliusknorr merged 4 commits into
masterfrom
bug/13226/uploaded-files
Jan 4, 2019
Merged

Re add the uploaded file list to file drops#13286
juliusknorr merged 4 commits into
masterfrom
bug/13226/uploaded-files

Conversation

@weeman1337

@weeman1337weeman1337 commented Dec 29, 2018

Copy link
Copy Markdown
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

@weeman1337weeman1337 self-assigned this Dec 29, 2018
@JSoko

JSoko commented Dec 29, 2018

Copy link
Copy Markdown
Member

Thank You,

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

@weeman1337

weeman1337 commented Dec 29, 2018

Copy link
Copy Markdown
MemberAuthor

@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

JSoko commented Dec 29, 2018•
edited
Loading

Copy link
Copy Markdown
Member

@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

weeman1337 commented Dec 29, 2018

Copy link
Copy Markdown
MemberAuthor

@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..

violoncelloCH
violoncelloCH approved these changes Dec 29, 2018
View reviewed changes

@violoncelloCHvioloncelloCH left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

tested and works! 👍

@violoncelloCH

violoncelloCH commented Dec 29, 2018

Copy link
Copy Markdown
Member

/backport to stable15

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

JSoko commented Dec 30, 2018

Copy link
Copy Markdown
Member

apps/files_sharing/js/templates.js

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

JSoko
JSoko approved these changes Dec 30, 2018
View reviewed changes

@JSokoJSoko left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Works well!

@JSokoJSoko mentioned this pull request Dec 30, 2018
Closed
@MorrisJobkeMorrisJobke mentioned this pull request Jan 4, 2019
Merged
3 tasks
juliusknorr
juliusknorr approved these changes Jan 4, 2019
View reviewed changes

@juliusknorrjuliusknorr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Really nice 👍

@weeman1337@juliusknorr
Add the file drop uploaded files element
2f0cd40
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
@weeman1337@juliusknorr
Removes lost single quote
e18796e
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
@weeman1337@juliusknorr
Tweak the uploaded files icon position
86a9518
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
@weeman1337@juliusknorr
Add compiled template
da9eadc
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
@juliusknorr
juliusknorrforce-pushed the bug/13226/uploaded-files branch from 75cda0c to da9eadcCompareJanuary 4, 2019 10:28
@juliusknorr

juliusknorr commented Jan 4, 2019

Copy link
Copy Markdown
Member

Rebased to re-run ci.

@juliusknorrjuliusknorr 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 masterJan 4, 2019
@juliusknorr
juliusknorr deleted the bug/13226/uploaded-files branch January 4, 2019 12:22
@backportbot-nextcloudbackportbot-nextcloudBot mentioned this pull request Jan 4, 2019
Merged
@backportbot-nextcloud

backportbot-nextcloudBot commented Jan 4, 2019

Copy link
Copy Markdown

backport to stable15 in #13355

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@juliusknorrjuliusknorrjuliusknorr approved these changes
@JSokoJSokoJSoko approved these changes
@violoncelloCHvioloncelloCHvioloncelloCH approved these changes
@danxuliudanxuliuAwaiting requested review from danxuliu
@MorrisJobkeMorrisJobkeAwaiting requested review from MorrisJobke

Assignees

@weeman1337weeman1337

Labels

4. to releaseReady to be released and/or waiting for tests to finishbug

Projects

None yet

Milestone

Nextcloud 16

Development

Successfully merging this pull request may close these issues.

4 participants

@weeman1337@JSoko@violoncelloCH@juliusknorr