Commit Graph

46623 Commits

Author SHA1 Message Date
Roeland Jago Douma 30b54cf287
Merge pull request #12263 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.24.0
Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2
2018-11-05 08:26:21 +01:00
Roeland Jago Douma 32f9a32352
Merge pull request #12264 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/css-loader-1.0.1
Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2
2018-11-05 08:25:15 +01:00
Roeland Jago Douma 4fa8dfb153
Merge pull request #12254 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-1.0.1
Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification
2018-11-05 08:19:44 +01:00
Roeland Jago Douma e81e11db46
Merge pull request #12255 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.24.0
Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification
2018-11-05 08:18:57 +01:00
dependabot[bot] 889dfb624b
Merge pull request #12257 from nextcloud/dependabot/npm_and_yarn/settings/nextcloud-vue-0.3.1 2018-11-05 07:13:29 +00:00
Roeland Jago Douma 4be625b128
Merge pull request #12231 from nextcloud/bugfix/10934/setmodel_before_render
Set the filemodel before rending the detailsview
2018-11-05 08:07:49 +01:00
dependabot[bot] ead6ce8e97
Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:20:03 +00:00
dependabot[bot] 436ee94fe6
Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2
Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:19:45 +00:00
dependabot[bot] a15f906af2
Bump nextcloud-vue from 0.2.0 to 0.3.1 in /settings
Bumps [nextcloud-vue](https://github.com/nextcloud/vue-components) from 0.2.0 to 0.3.1.
- [Release notes](https://github.com/nextcloud/vue-components/releases)
- [Commits](https://github.com/nextcloud/vue-components/compare/v0.2.0...v0.3.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:13:43 +00:00
dependabot[bot] e81ff4ebcb
Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification
Bumps [webpack](https://github.com/webpack/webpack) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:13:08 +00:00
dependabot[bot] 39b111d58d
Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 1.0.0 to 1.0.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v1.0.0...v1.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:12:42 +00:00
Nextcloud bot c28ea52155
[tx-robot] updated from transifex 2018-11-05 01:12:32 +00:00
Roeland Jago Douma 72b7c9ffa0
Merge pull request #12105 from nextcloud/using-resharing-right-to-display-shares
Shares are displayed to users with resharing rights
2018-11-04 21:08:11 +01:00
Roeland Jago Douma 4ebb2090db
Merge pull request #12230 from nextcloud/bugfix/do_not_logerror_on_filelock
Do not log FileLock as exception
2018-11-04 20:40:17 +01:00
Roeland Jago Douma ab8c2b0719
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-04 13:55:49 +01:00
Roeland Jago Douma 5d3051ff62
Do not log FileLock as exception
There is no reason to log FileLock errors as exceptions to the log file.
Locks happen for very legit reasons and it is actually a sign of the
code doing its job.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-04 13:55:49 +01:00
Nextcloud bot 9d7f02ec47
[tx-robot] updated from transifex 2018-11-04 01:14:02 +00:00
Roeland Jago Douma b9783993da
Merge pull request #10890 from nextcloud/bugfix/10857/app-menu-resize
Fix app menu calculation for random size of the right header
2018-11-03 09:35:14 +01:00
Nextcloud bot f196394c44
[tx-robot] updated from transifex 2018-11-03 01:12:38 +00:00
Roeland Jago Douma b1fd72c1cf
Set the filemodel before rending the detailsview
fixes #10934

Else it triggers the rendering two times. Resulting is weird state in
for example the comments. Because the comments for OLD_FILEID are
retrieved but then the model is changed to NEW_FILEID. But the old
comments still get in and get parsed.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 22:45:25 +01:00
Julius Härtl a696c011c2
Fix app menu calculation for random size of the right header
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-02 19:57:06 +01:00
Roeland Jago Douma 9d89f8bbac
Merge pull request #12071 from nextcloud/addressbook-uid-check-migration
Addressbook uid check migration
2018-11-02 19:37:48 +01:00
Roeland Jago Douma 927130ef34
Merge pull request #12215 from nextcloud/wait-for-the-link-share-menu-to-open-in-acceptance-tests
Wait for the link share menu to open in acceptance tests
2018-11-02 19:35:32 +01:00
Roeland Jago Douma bc98330a58
Merge pull request #12216 from nextcloud/bugfix/appmenu/loading
Fix loading indicator in app menu
2018-11-02 19:34:21 +01:00
Roeland Jago Douma 4ba709bb71
Merge pull request #11404 from flokli/sendmail-path
Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail
2018-11-02 16:17:02 +01:00
Julius Härtl 727df9f970
Fix loading indicator in app menu
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-02 15:11:18 +01:00
Roeland Jago Douma 30a1237f81
Merge pull request #11875 from nextcloud/add-support-for-sending-the-password-for-a-link-share-by-nextcloud-talk
Add support for sending the password for a link share by Nextcloud Talk
2018-11-02 14:54:46 +01:00
Daniel Calviño Sánchez fec8d12fc5 Wait for the link share menu to open in acceptance tests
In the acceptance tests the link share menu is automatically opened if
needed before interacting with an item in the menu; if the menu is not
open it is opened by clicking on its toggle.

However, since a recent change the link share menu is automatically
opened by the regular UI after the link share is created. This causes
that, sometimes, after the creation of a link share the acceptance tests
check whether the menu is shown or not before the menu was automatically
opened; as the menu is not open then the acceptance tests proceed to
click on the toggle, but in the meantime the link share was created and
the menu opened, so clicking on the toggle now closes it. As the menu is
closed it is not possible to interact with its items and the test fails.

To prevent that now the acceptance tests wait for the link share menu to
open after a link share is created before continuing with the other
steps.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-02 14:24:52 +01:00
John Molakvoæ (skjnldsv) 66624cfe0a
Phpunit fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-02 14:20:53 +01:00
Morris Jobke 337cd25187
Merge pull request #12200 from nextcloud/tech-debt/noid/cleanup-legacy-sharing
Cleanup some unused sharing methods from the old sharing code
2018-11-02 14:03:51 +01:00
Roeland Jago Douma 054056a8df
Fallback to default path is sendmail can't be found
If the sendmail binary can't be found at all we fallback to the default
path.
It most likely is not there but then at least a proper error message
pops up.

Updated the tests to also properly pass.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 14:03:11 +01:00
Morris Jobke f5728f2c14
Merge pull request #12190 from forsd/AddtestFiles_Trashbin
Add test OCA\Files_Trashbin\Capabilities
2018-11-02 14:01:25 +01:00
Florian Klink 7078a0e53e
Mailer: discover sendmail path instead of hardcoding it to /usr/sbin/sendmail
`sendmail` can very well be in a path different from
`/usr/sbin/sendmail`.

We already search `$PATH` at `lib/private/Settings/Admin/Mail.php` to
detect whether we want to offer sendmail as a mail transfer method, so
let's be consistent and actually initialize `\Swift_SendmailTransport`
with this path to sendmail, instead of just hardcoding
`/usr/sbin/sendmail`.

Signed-off-by: Florian Klink <flokli@flokli.de>
2018-11-02 13:57:43 +01:00
Roeland Jago Douma 7ba8700ba1
Merge pull request #12148 from nextcloud/suppress-wrong-audit-log-message
suppress wrong audit log messages about failed login attempts
2018-11-02 13:52:50 +01:00
Roeland Jago Douma 88cf60a149
Merge pull request #12198 from nextcloud/fix/noid/during-hard-failure-log-original-exception
Log the previous exception during hard failure
2018-11-02 13:49:32 +01:00
Daniel Calviño Sánchez f57b07e2c2 Add acceptance test steps to be used from Talk acceptance tests
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-02 13:30:22 +01:00
Daniel Calviño Sánchez a784e1fcc1 Test that "Password protect by Talk" is not shown if Talk is not enabled
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-02 13:30:22 +01:00
Daniel Calviño Sánchez 376704e834 Add "Password protect by Talk" to the menu of link shares
When Talk is enabled the menu for link shares now shows a checkbox to
protect the password by Talk (that is, to show the "Request password by
Talk" UI in the authentication page for the link share).

Although in e-mail shares protecting the share with a password and
protecting the password by Talk are mutually exclusive actions (as when
the password is set it is sent to the sharee, so it must be set again
when protecting it by Talk to be able to verify the identity of the
sharee), in the case of link shares protecting the password by Talk is
an additional step to protecting the share with a password (as just
setting the password does not disclose it to anyone). As such, the
checkbox is shown only when there is a password set for the link share
(even if the field itself for the password is not shown, like when they
are enforced in the settings).

Note that the icon set for the field, "icon-passwordtalk", does not
currently exist; it is the same used for e-mail shares, and it is needed
simply to get the right padding in the menu.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-11-02 13:30:18 +01:00
Julius Härtl 166907afef
Merge pull request #12182 from nextcloud/3rdparty/sabre-3.2.3
[3rdparty] Bump sabre/dav to 3.2.3
2018-11-02 13:09:46 +01:00
Maxence Lange 77b95ccd12
revert tests
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:10:49 +01:00
Maxence Lange 0fc8a0f58e
user can have his resharing rights revoked, yet seeing created shares
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:10:49 +01:00
Maxence Lange 236a293f6a
check parents resharing rights
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:10:48 +01:00
Julius Härtl 2a17811caf
Use property to check if a share entry is shared with the current user
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-02 12:10:48 +01:00
Julius Härtl 2804f3a761
Add uid_owner to enable permission settings on the views
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-02 12:09:29 +01:00
Julius Härtl 59377dbd50
Remove reshare owner entry from the share list
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-02 12:09:29 +01:00
Julius Härtl b73e03724c
Show share settings for owner and reshare owners only
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-02 12:09:29 +01:00
Maxence Lange 275cea5d9c
limit to circles moderator
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:09:28 +01:00
Maxence Lange 72ad2d60b5
display shares to circles moderator
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:09:28 +01:00
Maxence Lange 68c44bb642
shares are displayed to users with resharing rights
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2018-11-02 12:09:26 +01:00
Morris Jobke f13c7dda1c
Merge pull request #12207 from nextcloud/item-list-popover-fix
Fix popover menu alignment in list
2018-11-02 10:58:30 +01:00