Commit Graph

51568 Commits

Author SHA1 Message Date
Roeland Jago Douma 293585ec12
Merge pull request #18222 from nextcloud/fix/files/reload-on-share-accept
Properly reload file list on share accept
2019-12-04 14:10:17 +01:00
Roeland Jago Douma 50985e5461
Merge pull request #17913 from nextcloud/fix/transfer-ownership-move-files-error-handling
Catch file transfer error and stop transfer ownership command
2019-12-04 13:53:43 +01:00
John Molakvoæ bfb9ccec1f
Fix files app LoadSidebar event (#18213)
Fix files app LoadSidebar event
2019-12-04 12:47:40 +01:00
Roeland Jago Douma 76b78edd40
Merge pull request #17833 from nextcloud/propagator-no-negative-sizes
dont set folder size to negative values during propagation
2019-12-04 11:49:26 +01:00
Roeland Jago Douma d4f1cc7da6
Merge pull request #18161 from nextcloud/fix/noid/absocsroute-subfolder
fix generation of an url to an absolute ocs route when NC in subfolder
2019-12-04 11:49:06 +01:00
Roeland Jago Douma 17eece7fc4
Merge pull request #18220 from nextcloud/fix/theming/tests
Fix the theming tests
2019-12-04 11:29:31 +01:00
John Molakvoæ (skjnldsv) f3cdf7e4c1
Properly reload file list on share accept
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-12-04 11:29:04 +01:00
Joas Schilling 738e6bf079
Merge pull request #17715 from nextcloud/fix/5456/respect_avatar_privacy
Honor avatar visibility settings
2019-12-04 10:28:45 +01:00
Nextcloud bot 7f80859ce4
[tx-robot] updated from transifex 2019-12-04 09:24:13 +00:00
John Molakvoæ (skjnldsv) 46ce797197
Properly query files
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-12-04 09:57:55 +01:00
Joas Schilling 19935a6a26
Merge pull request #17949 from nextcloud/debt/deprecated-const
Connection::TRANSACTION_READ_COMMITTED is deprecated
2019-12-04 09:49:41 +01:00
John Molakvoæ (skjnldsv) c1277ea2fa
Use own getIconUrl method
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-12-04 09:44:35 +01:00
Roeland Jago Douma 0fe1d2a530
Merge pull request #18209 from nextcloud/bugfix/noid/directediting-token-getuser
Add missing getUser method to direct editing IToken interface
2019-12-04 09:10:46 +01:00
Roeland Jago Douma 99ed3b2d52
Merge pull request #18212 from nextcloud/bugfix/noid/subject-message-mixed-up
Fix mixed up message and subject on notifications for file transfer
2019-12-04 09:09:34 +01:00
Roeland Jago Douma 867dea9cb3
Merge pull request #18215 from nextcloud/fix/setup/password_confirmation
Set last-password-confirmation for setup
2019-12-04 09:08:09 +01:00
John Molakvoæ (skjnldsv) 241aac9f94 Fix files app LoadSidebar event
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-12-04 08:07:42 +00:00
Roeland Jago Douma 069b938ab0
Fix the theming tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-12-04 09:07:24 +01:00
Nextcloud bot 323b2c71fc
[tx-robot] updated from transifex 2019-12-04 02:16:52 +00:00
Roeland Jago Douma c106a9d293
Set last-password-confirmation for setup
Else you have to enter your password directly after setup if you do
anything admin worthy.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-12-03 19:31:31 +01:00
Joas Schilling b721095507
Fix mixed up message and subject on notifications for file transfer
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-12-03 17:52:33 +01:00
John Molakvoæ cd71ad0e50
Merge pull request #17930 from nextcloud/rakekniven-patch-1
l10n: Triple dot to ellipsis
2019-12-03 15:40:03 +01:00
Julius Härtl 212b1571ff
Add missing getUser method to direct editing IToken interface
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-12-03 15:25:19 +01:00
John Molakvoæ 9cd7ecef9b
Merge pull request #18120 from nextcloud/bugfix/11087/dav_principal_backend_respect_sharing_settings
respect shareapi_allow_share_dialog_user_enumeration in Principal backend for Sabre/DAV
2019-12-03 13:49:06 +01:00
Roeland Jago Douma 2b19da84d5
Merge pull request #18140 from nextcloud/bugfix/17814/csp-svg
Allow inline styles for theming images
2019-12-03 10:48:04 +01:00
Roeland Jago Douma 109aee525d
Merge pull request #15952 from nextcloud/feature/noid/inherited-shares
Inherited Shares
2019-12-03 10:13:55 +01:00
Georg Ehrke c3748cfee3
respect shareapi_allow_share_dialog_user_enumeration in Principal backend for Sabre/DAV
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2019-12-03 09:44:07 +01:00
Roeland Jago Douma 9fce87b2df
Merge pull request #17443 from nextcloud/enh/expired_token_on_invalid_pass
Throw an invalid token exception is token is marked outdated
2019-12-03 08:59:11 +01:00
Roeland Jago Douma 1d707cc349
Merge pull request #18028 from nextcloud/enhancement/user-create-events
Add typed create user events
2019-12-03 08:57:51 +01:00
John Molakvoæ bcc32f6918
add update all button (#17512)
add update all button
2019-12-03 08:14:59 +01:00
John Molakvoæ faa6b8d114
Add space before ellipsis 2019-12-03 08:14:19 +01:00
Maxence Lange f2c7ca4584
fixing tests + avoid duplicate in getFormattedShares()
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2019-12-03 08:13:22 +01:00
John Molakvoæ (skjnldsv) 3a86b99256
Inherited share UI
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-12-03 08:13:21 +01:00
Maxence Lange ccf7d87c11
integration tests
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
add tests on non-owner pov

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
duplicate

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
small fixes

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
removed tags

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2019-12-03 08:10:27 +01:00
Maxence Lange 5794f14df9
Inherited Shares
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
working on users with resharing rights

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
-getLogger()

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
cleaning

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
fix type

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
Update SharingRightsException.php
2019-12-03 08:10:27 +01:00
Christoph Wurst cc80339b39
Add typed create user events
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-12-03 08:03:57 +01:00
Roeland Jago Douma 1e91b6a716
Merge pull request #18151 from nextcloud/bugfix/noid/overwrite-host-proxy
Always return overwritehost if configured
2019-12-03 07:48:19 +01:00
Nextcloud bot 4cbaf69bc3
[tx-robot] updated from transifex 2019-12-03 02:16:46 +00:00
Roeland Jago Douma c002a91aaa
Merge pull request #18167 from nextcloud/simplify-versioncheck
Use PHP_VERSION_ID to check for the current php version
2019-12-02 20:58:16 +01:00
Daniel Kesselberg 79541990ca
Use PHP_VERSION_ID to check for the current php version
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-12-02 19:28:09 +01:00
Roeland Jago Douma 60c0596cd9
Merge pull request #17736 from nextcloud/enh/transfer_ownership
Add a transfer ownership background job
2019-12-02 19:06:11 +01:00
Roeland Jago Douma b371e735cf
Throw an invalid token exception is token is marked outdated
This avoids hitting the backend with multiple requests for the same
token. And will help avoid quick LDAP lockouts.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-12-02 18:57:13 +01:00
Christoph Wurst 08a1b928aa
Also allow transfer ownership of files
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-12-02 15:28:49 +01:00
Roeland Jago Douma 5274c54268
Add a transfer ownership background job
This job can be initiated by a user to transfer a file/folder to a
target user.

The target user will have to accept the job.
Once that is done the transfers is initiated in the background.

Both parties get notified when the job is done.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-12-02 15:28:47 +01:00
John Molakvoæ b99134d0a3
Fix files_sharing app LoadSidebar event (#17821)
Fix files_sharing app LoadSidebar event
2019-12-02 15:10:25 +01:00
John Molakvoæ (skjnldsv) 5cb11ca642
Fix tests
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-12-02 13:08:43 +01:00
John Molakvoæ (skjnldsv) 0bf6fcd6cd
Create sharing entry point with constants
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-12-02 08:58:50 +01:00
John Molakvoæ (skjnldsv) f8af027686
Fix files_sharing app LoadSidebar event
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-12-02 08:58:50 +01:00
Roeland Jago Douma 407c2c13ab
Merge pull request #18159 from nextcloud/tests/comments-integration
Do not call count on null
2019-12-02 08:53:02 +01:00
Roeland Jago Douma e98ae45b83
Merge pull request #18178 from Rillian-Grant/patch-1
Minor typo
2019-12-02 08:41:34 +01:00
John Molakvoæ 2f81a37432
Bump url-loader from 2.3.0 to 3.0.0 (#18171)
Bump url-loader from 2.3.0 to 3.0.0
2019-12-02 08:27:41 +01:00