Commit Graph

45336 Commits

Author SHA1 Message Date
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
John Molakvoæ 3884038765
Merge pull request #10582 from nextcloud/fix/app-password-enter-this-context
Fix `this` context for enter-key handler on app tokens
2018-08-08 12:38:50 +02:00
John Molakvoæ f8e9f860eb
Merge pull request #10320 from nextcloud/feature/10176/Quick-Access-Cleanup
Cleanup of leftover-sorting-code from quickaccess-feature #9714 #9720
2018-08-08 12:27:12 +02:00
John Molakvoæ (skjnldsv) 91737b591e
js fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-08 11:24:13 +02:00
Roeland Jago Douma a3fdec7d4b
Merge pull request #10578 from nextcloud/fix/2fa-provider-registry-population
Fix 2FA provider registry population on login
2018-08-08 11:12:00 +02:00
Christoph Wurst b85e1188e1
Fix `this` context for enter-key handler on app tokens
Fixes https://sentry.io/share/issue/e07c5560b6154212832e4cd6598464c7/.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 11:07:47 +02:00
fnuesse 7a78e0c641
Cleanup of leftover-sorting-code from quickaccess-feature #9714 #9720
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-08 09:23:54 +02:00
John Molakvoæ e595cad880
Merge pull request #10561 from nextcloud/fix/10476/applist-layout
Fixes the apps list layout
2018-08-08 09:23:14 +02:00
John Molakvoæ b198e17071
Merge pull request #10568 from nextcloud/apps-menu-fixes
Fix apps max-height
2018-08-08 09:22:21 +02:00
Roeland Jago Douma 75de67a98f
Merge pull request #10525 from nextcloud/notifications-fix
Fixed notifications position
2018-08-08 09:15:26 +02:00
Roeland Jago Douma bee65f8053
Merge pull request #10572 from nextcloud/bugfix/10464/security-password-change
Fix security settings if password change is disabled
2018-08-08 08:32:54 +02:00
Christoph Wurst d248a0bd1e
Fix 2FA provider registry population on login
If the 2FA provider registry has not been populated yet, we have to make
sure all available providers are loaded and queried on login. Otherwise
previously active 2FA providers aren't detected as enabled.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2018-08-08 06:57:52 +02:00
Nextcloud bot 1cb8fe3cb0
[tx-robot] updated from transifex 2018-08-08 00:13:19 +00:00
Roeland Jago Douma 70dab08dc8
Merge pull request #10569 from nextcloud/custom-avatar-userconfig
get avatar custom status from user config
2018-08-07 20:44:40 +02:00
blizzz 5685ed4c7d
Merge pull request #10567 from nextcloud/icons-cacher-fix
Icons cacher css url fix
2018-08-07 18:23:36 +02:00
Michael Weimann 978fc50c65
Updates the built files
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-08-07 18:02:14 +02:00
Michael Weimann d1636147eb
Fixes the apps list layout
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
2018-08-07 18:02:13 +02:00
Julius Härtl 318682dd6d
Fix security settings if password change is disabled
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-08-07 17:41:01 +02:00
Robin Appelman ec8ab83ea5
get avatar custom status from user config
this saves a cache operation because the user config is already cached

Signed-off-by: Robin Appelman <robin@icewind.nl>
2018-08-07 14:55:33 +02:00
John Molakvoæ (skjnldsv) 2b15b4cb74
Fix apps max-height
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-07 10:27:39 +02:00
John Molakvoæ (skjnldsv) 7e6fa90fa1
Icons cacher css url fix
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-08-07 10:18:46 +02:00
Björn Schießle f8de12c014
Merge pull request #10558 from nextcloud/fix/noid/failing_sync_job_is_no_error
A failing federation sync job is not an error
2018-08-07 10:09:24 +02:00
Nextcloud bot 35342b4b7d
[tx-robot] updated from transifex 2018-08-07 00:12:06 +00:00
Roeland Jago Douma dd5862e270
A failing federation sync job is not an error
This is an INFO warning at best. Else it spams the logs continiously.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-06 21:07:15 +02:00
Roeland Jago Douma aa5956f1eb
Merge pull request #10550 from nextcloud/fix/noid/do_not_log_to_error
Do not log to error loglevel when converting the error
2018-08-06 19:59:29 +02:00
Joas Schilling f5c63d7a6e
Disable Oracle enforcement for now until the following issues are solved:
* Only apps should be checked which say they support oracle
* Only check newly added items, to allow forward migration from an existing database structure

Signed-off-by: Joas Schilling <coding@schilljs.com>
2018-08-06 17:34:40 +02:00
blizzz db941a3f2e
Merge pull request #10523 from janLo/fix-8825
Adding test for table schedulingobjects and fixing postgres LOB
2018-08-06 17:17:47 +02:00
Roeland Jago Douma 01bbd28530
Do not log to error loglevel when converting the error
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-06 16:31:30 +02:00
Joas Schilling f67d942fad
Merge pull request #10530 from nextcloud/bugfix/10528/public-template
Fix issues when using the public layout without a PublicTemplateResponse
2018-08-06 15:41:54 +02:00
Roeland Jago Douma 49662f3def
Merge pull request #10485 from nextcloud/update-triangle
Fix design of update error page
2018-08-06 15:38:43 +02:00