wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
45149 commits 157 branches 562 tags 714 MiB
Commit graph

45149 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
5edf36dc53
Merge pull request #10325 from nextcloud/lost-password-ldap-fix 
Do not bind reset password link if an url is set
 2018-07-23 15:53:18 +02:00
Roeland Jago Douma
08395b8338
Update map 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-23 15:24:28 +02:00
John Molakvoæ (skjnldsv)
fee62fd20b
Comply @since requirements 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-23 15:17:38 +02:00
John Molakvoæ (skjnldsv)
705439ca7b
Do not bind reset password link if an url is set 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-23 15:01:03 +02:00
dependabot[bot]
83f56d0136
Bump vue-loader from 15.2.4 to 15.2.6 in /settings 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.2.4 to 15.2.6.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/compare/v15.2.4...v15.2.6)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-23 14:59:25 +02:00
dependabot[bot]
fa6172fa7d
Bump webpack-cli from 3.0.8 to 3.1.0 in /settings 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-23 14:58:36 +02:00
dependabot[bot]
0119546a3a
Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/updatenotification 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 3.0.8 to 3.1.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/commits)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-07-23 01:12:53 +00:00
Nextcloud bot
4d060755e5
[tx-robot] updated from transifex 2018-07-23 00:12:05 +00:00
Michael Weimann
353bd8ee8a Adjusts the files multi select header width 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-07-22 11:44:06 +02:00
Nextcloud bot
8ac1f4168d
[tx-robot] updated from transifex 2018-07-22 00:12:42 +00:00
John Molakvoæ (skjnldsv)
e6ded2ad5e
Design fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 18:31:06 +02:00
Daniel Calviño Sánchez
70262fb11a Adjust acceptance tests to the new share link UI 
The share link UI no longer uses its own layout below the other shares;
now it is shown as a share row with a menu for the actions (except
enabling it, which is shown in the row itself), just like the other
shares.

The share link is no longer shown, either; now the link is got by
clicking on a "Copy URL" menu item, which copies the link to the
clipboard. As the clipboard is not accessible from the acceptance tests
the URL is now extracted from the attributes of that menu item (although
the menu item is clicked anyway to mimic the user behaviour).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-21 17:31:11 +02:00
John Molakvoæ (skjnldsv)
da0bdd1391 Design structure fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 16:09:13 +02:00
John Molakvoæ (skjnldsv)
58debbe42c
Tests fixes and design bump 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:21 +02:00
Julius Härtl
e302cadae2
Don't use shorthand syntax for functions 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-21 15:02:21 +02:00
John Molakvoæ (skjnldsv)
d4de77afb9
No remote note and various fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:21 +02:00
Bjoern Schiessle
977c462698
move the note up, so that it is also visible in the file drop view 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:21 +02:00
John Molakvoæ (skjnldsv)
3a11c26cb4
Public fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv)
c71d3dc9bf
Public share 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:20 +02:00
Bjoern Schiessle
e951ad5034
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:20 +02:00
Bjoern Schiessle
967a97904f
fix post url 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv)
fc2767bbbb
Autoresize + autoloader 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv)
0a7e34f6c8
Popovermenu migration 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:20 +02:00
Bjoern Schiessle
fa44300016
unit tests updated 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:20 +02:00
John Molakvoæ (skjnldsv)
4e08d8342e
UI set share note! 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-21 15:02:20 +02:00
Bjoern Schiessle
72d2455577
return the as well note if we fetch a share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
660b5d1af6
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
7bdedfba48
explicitely mention that the note column can be null 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
eab4d96c4c
some small template fixes 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
94c7052482
allow 'note' to be null 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
b81962e3e8
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
2250dbec21
add a nice looking button as direct link to the sharre 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:19 +02:00
Bjoern Schiessle
1ce519ad38
add direct link to the share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
b56ccef564
add direct link to the file for user/group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a29261175d
fix mail templates 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
4f59c8e8ae
show note on public link page 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
73b88deeb8
add note to share object when reading it from the db 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
c116d116fa
improve mail template and escape html code 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Bjoern Schiessle
a93f2a648b
allow to add a personal note to a share 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-21 15:02:18 +02:00
Michael Weimann
de7606dc68 Adds disabled user unit tests 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-07-21 13:05:25 +02:00
Michael Weimann
c92d7429d7 Implements handling for deactivated users 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-07-21 13:05:13 +02:00
Nextcloud bot
cce12f0ca3
[tx-robot] updated from transifex 2018-07-21 00:12:01 +00:00
Morris Jobke
53aaa62572
Merge pull request #9982 from nextcloud/global-flow-rebuild 
Cleanup structure
 2018-07-20 23:40:00 +02:00
John Molakvoæ (skjnldsv)
89ee10a536
Jsunit fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:49 +02:00
John Molakvoæ (skjnldsv)
4877cd050b
Bump karma config 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
John Molakvoæ (skjnldsv)
8d3f58c391
Jsunit fixes 1 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
John Molakvoæ (skjnldsv)
43ab2082db
Fixed filestable min-width 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
Jan-Christoph Borchardt
a9f65390f6
Widen left navigation to 300px and set max-width of right sidebar to 500px 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
John Molakvoæ (skjnldsv)
ecaf4d7008
Fix sidebar close button 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00
John Molakvoæ (skjnldsv)
e27e430f1f
use flex for main content 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-20 23:38:04 +02:00