Commit Graph

45615 Commits

Author SHA1 Message Date
Julius Härtl c954eb1d12
Apply flex-basis to right header
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-09 16:46:43 +02:00
Roeland Jago Douma 8c1e75e052
Do not use file as template parameter
Using file will overwrite the $file parameter in the template base.
Leading to trying to include a file that is the exception message. Which
will of course fail.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-09 16:45:25 +02:00
Joas Schilling e1d3965883
Add the ToS app to the enterprise bundle
Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-09 16:12:48 +02:00
Roeland Jago Douma 88603e98f8
Merge pull request #10611 from nextcloud/fix/2fa-provider-user-dao-duplicate-key
Fix duplicate key violation in 2FA provider registry DAO
2018-08-09 15:52:51 +02:00
Robin Appelman 5e9d6b1585
use insertIfNotExists to store new mimetypes.
Also throw an error if we can't find the mimetype after insert

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-09 15:20:55 +02:00
Julius Härtl 4823b2746e
Redirect to the same page after an update
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-09 15:19:58 +02:00
Robin Appelman 16909f04c2
Fix trashbin file actions
Fixes #10491

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-09 14:31:02 +02:00
Christoph Wurst 8db66d5dfb
Fix double-inserts of the same provider state
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-09 13:56:04 +02:00
Christoph Wurst 85bc5edb5e
Add integration/unit test for the double-insert of same values
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-09 13:43:00 +02:00
John Molakvoæ (skjnldsv) fc4f122881
Align to the left
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-09 12:47:50 +02:00
John Molakvoæ (skjnldsv) 1d05e457d6
Typo
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-09 12:46:08 +02:00
John Molakvoæ (skjnldsv) fd806366ca
Fix header menu & contact popover
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-09 12:42:59 +02:00
Roeland Jago Douma 0757c52980
Merge pull request #10588 from nextcloud/fix/single-2fa-provider-login-redirect
Fix login redirection if only one 2FA provider is active
2018-08-09 12:27:29 +02:00
Roeland Jago Douma def2bf2086
Merge pull request #10604 from nextcloud/release/14/beta3
Nextcloud 14.0.0 beta3
2018-08-09 11:29:01 +02:00
Roeland Jago Douma dff35edaca
Nextcloud 14.0.0 beta3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-09 11:18:21 +02:00
Björn Schießle 6aa6d2186c
Merge pull request #10255 from nextcloud/add-support-for-room-shares
Add support for room shares
2018-08-09 10:44:11 +02:00
Roeland Jago Douma ca0f2f63eb
Merge pull request #10537 from MartB/mselect_fix
Fix multiSelectMenu for public shares #10536
2018-08-09 10:41:38 +02:00
Roeland Jago Douma a21c93a3cf
Merge pull request #8690 from nextcloud/feature/8565/make-thunderbird-and-outlook-addons-identifyable
[Part2] Make thunderbird and outlook addons identifyable
2018-08-09 09:55:26 +02:00
Roeland Jago Douma ad8e7d8665
Merge pull request #10597 from nextcloud/fix/10583/guest-icon-paths
Restores the guest icons
2018-08-09 09:45:45 +02:00
Roeland Jago Douma b4e282e477
Merge pull request #10599 from nextcloud/fix/app-code-checker-ignore-build-dir
Fix app code checker to ignore `build` directory
2018-08-09 08:50:31 +02:00
Julius Härtl 473be0fb01
Merge pull request #10600 from nextcloud/fix/info-xsd-out-of-sync
Fix info.xsd to sync with the appstore one
2018-08-09 08:20:03 +02:00
Christoph Wurst e53c048bc8
Fix info.xsd to sync with the appstore one
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-09 06:58:18 +02:00
Christoph Wurst 201cbf2d33
Fix app code checker to ignore `build` directory
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-09 06:44:52 +02:00
schoonc b0917dfac9
Removed unused variable isFile 2018-08-09 00:30:42 +03:00
Michael Weimann 9135e10062
Restores the guest icons 2018-08-08 23:19:37 +02:00
Christoph Wurst d8197f2b97
Rename providerset method to get primary providers
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 20:28:21 +02:00
Roeland Jago Douma 7648bb05e9
Merge pull request #10548 from nextcloud/fix/10430/update_icewind_streams
Update icewind/streams
2018-08-08 20:18:59 +02:00
Björn Schießle 11e99859ef
Merge pull request #10397 from nextcloud/encryption-s3-fix
make file cache updates more robust
2018-08-08 18:27:18 +02:00
Robin Appelman 24aaa3bc97
retry stat on timeout
Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-08 16:07:41 +02:00
Christoph Wurst c6e47e8a51
Fix login redirection if only one 2FA provider is active
Fixes https://github.com/nextcloud/server/issues/10500.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 15:25:59 +02:00
Daniel Calviño Sánchez 4b7fa4ac2e Add support for tokens in room shares
Tokens will be used to give access to a share to guests in public rooms.
Although the token itself is created in the provider of room shares and
no changes are needed for that, due to the code structure it is
necessary to explicitly call the provider from the manager when getting
a room share by token.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:44 +02:00
Daniel Calviño Sánchez e2e6f23b67 Suppress Phan warnings about calling undeclared class methods
The DeletedShareAPIController and ShareAPIController helpers for room
shares are defined in Talk, so the classes do not exist when Talk is not
installed. Due to this when the object returned by "getRoomShareHelper"
is used Phan complains that the class is not declared.

This is not a problem, though, because when the class is not available
"getRoomShareHelper" throws an exception, which is then caught where
that method was called. Therefore now those warnings from Phan are
suppressed (it would be better to use "@phan-suppress-next-line"
instead, but it is not yet available in our Phan version).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:44 +02:00
Daniel Calviño Sánchez e1561f0e8f Add custom handling for room shares to the resharer information
Like done with group shares, received room shares are described as such
in the UI.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:44 +02:00
Daniel Calviño Sánchez 2d062daa11 Add custom handling for room shares to the list of sharees
Like done for other types of shares, room shares are now explicitly
described as such in the UI.

The avatar used is the image provided in the "shareWithAvatar" property
of the share. If none is given then the avatar is the first letter of
the display name of the room share with a coloured background seeded
from the room token. If the display name of the room is empty then no
letter is shown in the avatar; no special handling is done in that case.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 0fab46c817 Log sharing and unsharing with a room in the auditing app
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 30d8e3ee05 Transfer room shares too with the "files:transfer-ownership" command
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 523fdb612c Add room shares to DAV and recent files "share-types" property
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 1ccc99ed83 Add support for room shares to the share owner updater
A user can move her own shares into a received share. When that happens
she is effectively handing over the ownership of the file, so the share
needs to be updated to reflect the new owner.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 8084ba516f Add room shares to the MountProvider for shares
The MountProvider for shares creates mount points for the files shared
with the user, which makes possible to use the received shared files and
folders as regular files and folders.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez de403f2f3d Add integration test for creating room shares when Talk is not enabled
The test just ensures that the controller will gracefully reject the
creation instead of failing miserably; the integration tests when Talk
is enabled are in the Talk repository.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 382b27d035 Add support for room shares to DeletedShareAPIController
In some cases, the DeletedShareAPIController requires explicit handling
of each type of share (for example, to format a share for a
DataResponse). Room shares are implemented in an external app (Nextcloud
Talk), so in order to keep the controller as isolated as possible from
room share specifics all that explicit handling is done in a helper
class provided by the Talk app.

In other cases it is just enough to call the share manager specifying a
room share type; note that the share manager is guarded against share
types for which there is no provider, so it is not necessary to
explicitly check that before passing room shares to the share manager.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 4ed7131e26 Add support for room shares to ShareAPIController
In some cases, the ShareAPIController requires explicit handling of each
type of share (for example, to format a share for a DataResponse). Room
shares are implemented in an external app (Nextcloud Talk), so in order
to keep the controller as isolated as possible from room share specifics
all that explicit handling is done in a helper class provided by the
Talk app.

In other cases it is just enough to call the share manager specifying a
room share type; note that the share manager is guarded against share
types for which there is no provider, so it is not necessary to
explicitly check that before passing room shares to the share manager.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez d9458b303a Add support for room shares to the share manager
Room shares are implemented in an external app (Nextcloud Talk), so in
order to keep the share manager as isolated as possible from room share
specifics all the validity checks are done in the provider of room
shares. However, due to the code structure it is necessary to explicitly
check for room shares in "generalCreateChecks" to prevent an exception
from being thrown.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 4ee839d69c Add provider for room shares
The RoomShareProvider is provided by the Talk app, so it is necessary to
check whether the app is available or not, and also whether the class
itself exists or not (just in case an older version of the app that did
not have support yet for room shares is being used).

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 857bb45366 Add comment with IDs of internal share types
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Daniel Calviño Sánchez 7292a986a0 Add type for room shares
This type represents shares with a Nextcloud Talk conversation.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-08-08 14:25:43 +02:00
Roeland Jago Douma 6b1ba9cdaf
Merge pull request #10553 from nextcloud/bugfix/10518/disable-oracle-enforcement-for-now
Disable Oracle enforcement for now until the following issues are sol…
2018-08-08 14:10:18 +02:00
Roeland Jago Douma e7e30ac25f
Merge pull request #10586 from nextcloud/fix/noid/check_if_ua_is_set
Check if HTTP_USER_AGENT is set before using it
2018-08-08 13:59:31 +02:00
Roeland Jago Douma c74a5250e5
Check if HTTP_USER_AGENT is set before using it
Sentry reported some errors regarding this. Apparently not everybody
sets a user agent. If it is not set we assume this is not IE ;)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-08 13:32:03 +02:00
Roeland Jago Douma fe286e21ca
Fix tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-08 12:58:50 +02:00