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

44865 commits

This branch
This branch
All branches
Author SHA1 Message Date
Daniel Calviño Sánchez
7849630cef Add support for sending the password by Talk to ShareAPIController 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 14:04:17 +02:00
Daniel Calviño Sánchez
d582a66bea Honour "sendPasswordByTalk" property in mail shares 
When a password was set for a mail share an e-mail was sent to the
recipient with the password. Now the e-mail is no longer sent if the
password is meant to be sent by Talk.

However, before the e-mail was not sent when the share was updated but
the password was not changed. Now an e-mail is sent in that case too if
switching from a password sent by Talk to a password sent by mail.

On the other hand, when switching from a password sent by mail to a
password sent by Talk it is mandatory to change the password; otherwise
the recipient would already have access to the share without having to
call the sharer to verify her identity.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:29 +02:00
Daniel Calviño Sánchez
dd0c5e297e Store "sendPasswordByTalk" property of mail shares in the database 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:28 +02:00
Daniel Calviño Sánchez
88600f4ecf Add "sendPasswordByTalk" property to shares 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:28 +02:00
Daniel Calviño Sánchez
49fd17ff14 Add "password_by_talk" column to "share" table in the database 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-07-24 13:56:25 +02:00
Morris Jobke
dfe6c1b7e2
Merge pull request #10363 from nextcloud/structure-mobile-and-public-fixes 
Structure mobile and public fixes
 2018-07-24 11:26:22 +02:00
John Molakvoæ (skjnldsv)
84bc30200e
Phpunit tests fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-24 11:01:11 +02:00
John Molakvoæ (skjnldsv)
440b5c944f
Fixed scrolling container 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-24 11:01:11 +02:00
John Molakvoæ (skjnldsv)
0274507cb1
Acceptance and mobile navigation fixes 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-07-24 11:01:11 +02:00
Morris Jobke
262cb04c3a
Merge pull request #10331 from weeman1337/fix-10330-files-multi-select-header 
Adjusts the files multi select header width
 2018-07-24 10:48:55 +02:00
Roeland Jago Douma
b41d0d32e2
Merge pull request #10218 from nextcloud/share-comments 
allow to add a personal note to a share
 2018-07-24 09:12:03 +02:00
Nextcloud bot
241e5705cb
[tx-robot] updated from transifex 2018-07-24 00:12:01 +00:00
Morris Jobke
1e431bf6ba
Merge pull request #10338 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-loader-15.2.6 
Bump vue-loader from 15.2.4 to 15.2.6 in /apps/updatenotification
 2018-07-23 22:14:34 +02:00
Morris Jobke
fa0f98059b
Merge pull request #10342 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/vue-loader-15.2.6 
Bump vue-loader from 15.2.4 to 15.2.6 in /apps/oauth2
 2018-07-23 22:14:12 +02:00
Morris Jobke
89211d5e9b
Merge pull request #10344 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-cli-3.1.0 
Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/accessibility
 2018-07-23 22:13:52 +02:00
Morris Jobke
b91e758baa
Merge pull request #10356 from nextcloud/bugfix/noid/dont-call-getuid-on-null 
Don't call getUID on null when the app is loaded for a guest
 2018-07-23 22:12:39 +02:00
dependabot[bot]
44811b52b8
Bump vue-loader from 15.2.4 to 15.2.6 in /apps/oauth2 
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 19:19:15 +00:00
Roeland Jago Douma
f25d34b293
Merge pull request #10355 from nextcloud/bugfix/noid/make-sure-error-log-always-receives-a-string 
Make sure error_log() always receives a string
 2018-07-23 21:17:38 +02:00
dependabot[bot]
7509bd224f
Bump vue-loader from 15.2.4 to 15.2.6 in /apps/updatenotification 
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 19:17:14 +00:00
dependabot[bot]
09373b1f41
Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/accessibility 
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 19:17:11 +00:00
Roeland Jago Douma
a5b76d7932
Merge pull request #10343 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/vue-loader-15.2.6 
Bump vue-loader from 15.2.4 to 15.2.6 in /apps/accessibility
 2018-07-23 21:14:51 +02:00
dependabot[bot]
a3fd5cebc0
Bump vue-loader from 15.2.4 to 15.2.6 in /apps/accessibility 
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 17:57:14 +00:00
Roeland Jago Douma
4cb9f35dea
Merge pull request #10341 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-cli-3.1.0 
Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/oauth2
 2018-07-23 19:54:55 +02:00
Michael Weimann
9977b1415d Uses a variable for the multiselect header offset 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2018-07-23 18:59:00 +02:00
Joas Schilling
3cac54b955
Don't call getUID on null when the app is loaded for a guest 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-23 16:39:03 +02:00
Joas Schilling
b788f0a456
Make sure error_log() always receives a string 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-23 16:30:38 +02:00
dependabot[bot]
eeab309515
Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/oauth2 
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:14:22 +00:00
Morris Jobke
29fd761301
Merge pull request #10337 from nextcloud/dependabot/npm_and_yarn/settings/vue-loader-15.2.6 
Bump vue-loader from 15.2.4 to 15.2.6 in /settings
 2018-07-23 16:12:28 +02:00
Morris Jobke
1755ae1cb8
Merge pull request #10335 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-cli-3.1.0 
Bump webpack-cli from 3.0.8 to 3.1.0 in /apps/updatenotification
 2018-07-23 15:56:21 +02:00
Morris Jobke
c559e1dc6a
Merge pull request #10340 from nextcloud/dependabot/npm_and_yarn/settings/webpack-cli-3.1.0 
Bump webpack-cli from 3.0.8 to 3.1.0 in /settings
 2018-07-23 15:54:42 +02:00
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