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.

Sign up for GitHub

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

Jump to bottom

allow to add a personal note to a share #10218

Merged
merged 30 commits into from
Jul 24, 2018
Merged

allow to add a personal note to a share #10218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
a93f2a6
allow to add a personal note to a share
schiessle Jul 12, 2018
c116d11
improve mail template and escape html code
schiessle Jul 12, 2018
73b88de
add note to share object when reading it from the db
schiessle Jul 12, 2018
4f59c8e
show note on public link page
schiessle Jul 12, 2018
a292611
fix mail templates
schiessle Jul 12, 2018
b56ccef
add direct link to the file for user/group shares
schiessle Jul 12, 2018
1ce519a
add direct link to the share
schiessle Jul 12, 2018
2250dbe
add a nice looking button as direct link to the sharre
schiessle Jul 12, 2018
b81962e
fix unit tests
schiessle Jul 13, 2018
94c7052
allow 'note' to be null
schiessle Jul 13, 2018
eab4d96
some small template fixes
schiessle Jul 13, 2018
7bdedfb
explicitely mention that the note column can be null
schiessle Jul 13, 2018
660b5d1
fix unit tests
schiessle Jul 13, 2018
72d2455
return the as well note if we fetch a share
schiessle Jul 13, 2018
4e08d83
UI set share note!
skjnldsv Jul 14, 2018
fa44300
unit tests updated
schiessle Jul 13, 2018
0a7e34f
Popovermenu migration
skjnldsv Jul 18, 2018
fc2767b
Autoresize + autoloader
skjnldsv Jul 18, 2018
967a979
fix post url
schiessle Jul 19, 2018
e951ad5
fix unit tests
schiessle Jul 19, 2018
c71d3dc
Public share
skjnldsv Jul 19, 2018
3a11c26
Public fixes
skjnldsv Jul 19, 2018
977c462
move the note up, so that it is also visible in the file drop view
schiessle Jul 19, 2018
d4de77a
No remote note and various fixes
skjnldsv Jul 19, 2018
e302cad
Don't use shorthand syntax for functions
juliushaertl Jul 20, 2018
58debbe
Tests fixes and design bump
skjnldsv Jul 20, 2018
da0bdd1
Design structure fixes
skjnldsv Jul 21, 2018
70262fb
Adjust acceptance tests to the new share link UI
danxuliu Jul 21, 2018
e6ded2a
Design fixes
skjnldsv Jul 21, 2018
fee62fd
Comply @since requirements
skjnldsv Jul 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ nbproject
/build/jsdocs/
/npm-debug.log
/PhantomJS_*
/build/package-lock.json

# puphpet
puphpet
Expand Down
6 changes: 0 additions & 6 deletions apps/files/css/detailsView.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,6 @@
clear: both;
}

#app-sidebar .mainFileInfoView {
margin-right: 20px; /* accommodate for close icon */
float:left;
display:block;
width: 100%;
}

#app-sidebar .mainFileInfoView .icon {
display: inline-block;
Expand Down
3 changes: 2 additions & 1 deletion apps/files/css/files.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@
@include icon-color('star-dark', 'files', $color-black, 2, true);
}
.nav-icon-sharingin,
.nav-icon-sharingout {
.nav-icon-sharingout,
.nav-icon-shareoverview {
@include icon-color('share', 'files', $color-black);
}
.nav-icon-sharinglinks {
Expand Down
5 changes: 5 additions & 0 deletions apps/files_sharing/css/public.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,3 +169,8 @@ thead {
opacity: .57;
margin-top: 10px;
}

#note {
text-align: center;
padding: 10px;
}
Loading