Commit Graph

44888 Commits

Author SHA1 Message Date
Morris Jobke 9b9d729acf
Merge pull request #10238 from nextcloud/add-support-for-sending-the-password-for-a-share-by-nextcloud-talk
Add support for sending the password for a share by Nextcloud Talk
2018-07-24 17:06:56 +02:00
Morris Jobke 7da815bb04
Merge pull request #10298 from nextcloud/bugfix/talk-714/only-migrate-the-schema-when-moving-database
Only create the schema when moving between databases
2018-07-24 16:14:05 +02:00
Morris Jobke d67e18b28e
Merge pull request #10348 from nextcloud/fix-transfering-ownership-of-a-share-to-user-with-same-id-as-receiver
Fix transfering ownership of a share to user with same id as receiver
2018-07-24 15:34:45 +02:00
Morris Jobke 0280245fdd
Merge pull request #10375 from nextcloud/background-scan-root
Do scan the root storage in background scan
2018-07-24 15:20:49 +02:00
Daniel Calviño Sánchez b7474ed482
Fix transfering ownership of a share to user with same id as receiver
When the ownership of a user share is transfered to the receiver the
share is removed, as the receiver now owns the original file. However,
due to a missing condition, any share with a group, link or remote with
the same id as the user was removed, not only the user shares.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-07-24 15:05:42 +02:00
Daniel Calviño Sánchez 911093549e Make possible to enable "sending password by Talk" from the share menu
Until now the password to be sent by mail was set by enabling a checkbox
in the share menu and then entering the password in an input field shown
below. Now, when Talk is enabled, another item is added to the share
menu to do the same for a password to be sent by Talk.

Sending the password by mail and sending it by Talk are mutually
exclusive actions, so when one of the checkboxes is enabled the other
one is automatically disabled.

Note that the icon set for the field, "icon-passwordtalk", does not
currently exist; it simply mimics the "icon-passwordmail" (which does
not exist either) used for the field of the password protect by mail to
get the right padding in the menu.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-07-24 14:45:42 +02:00
Morris Jobke 5cfac8ecea
Merge pull request #10353 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.16.2
Bump webpack from 4.16.0 to 4.16.2 in /apps/updatenotification
2018-07-24 14:34:12 +02:00
Robin Appelman 5e940366c2
Do scan the root storage in background scan
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-07-24 14:15:27 +02:00
Daniel Calviño Sánchez 96108ab858 Add event to load additional scripts in the auth page for public shares
Before the public share authentication page is rendered now an event to
load additional scripts is dispatched. Thanks to this any app can load
its own scripts that, when run on the browser, adjust as needed the page
generated by the server.

Note, however, that during the handling of the event apps are only able
to add scripts or styles to be loaded; they can not render arbitrary
content on the page, or change how the content is rendered by the
original template; all those changes have to be done by the scripts at
run-time.

This implies that the scripts of the apps can use only those parameters,
like the token of the share, added to the page when it is generated by
the "publicshareauth" template. Due to this, and given that the event is
being introduced to be used by Talk to inject the UI needed to request
the password for a share, the token of the share is now provided in the
generated page, just like done in the public share page.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-07-24 14:04:22 +02:00
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 f7c7ff5f85
Merge pull request #10326 from nextcloud/svg-api-suf-fixes
Fix regex of iconsCacher
2018-07-24 13:36:39 +02:00
Morris Jobke e8b0868b58
Merge pull request #10327 from nextcloud/focus-comment-on-tabs-select
Focus comment on tabs select + design fixes
2018-07-24 13:34:51 +02:00
Morris Jobke 147ada54fa
Merge pull request #10369 from nextcloud/techdebt/noid/avoid-404-on-developer-console
Remove hint to .map.js files on vendor projects that we do not ship
2018-07-24 13:34:16 +02:00
Roeland Jago Douma c2b04634bb
Rerun js build
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-24 13:23:43 +02:00
John Molakvoæ (skjnldsv) 52af49ead5
Fixed comments design
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 12:34:03 +02:00
John Molakvoæ (skjnldsv) b7317a35e7
Focus the comment input on tab select/loading
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 12:34:02 +02:00
John Molakvoæ (skjnldsv) f62d4d174d
new tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 12:21:07 +02:00
John Molakvoæ (skjnldsv) 6bcfe8d628
Uppercase
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 12:15:14 +02:00
John Molakvoæ (skjnldsv) 85a481d2b6
Fix regex of iconsCacher
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 12:15:14 +02:00
John Molakvoæ (skjnldsv) a9e554beec
Fix header controls sticky positioning
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-07-24 12:08:31 +02:00
Morris Jobke e341367030
Remove hint to .map.js files on vendor projects that we do not ship
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2018-07-24 11:32:09 +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
Roeland Jago Douma c8b476c9cd
Rebuild updatenotifications
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-24 11:19:43 +02:00
dependabot[bot] 97c874161d
Bump webpack from 4.16.0 to 4.16.2 in /apps/updatenotification
Bumps [webpack](https://github.com/webpack/webpack) from 4.16.0 to 4.16.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.16.0...v4.16.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-07-24 11:19:21 +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