Commit Graph

9607 Commits

Author SHA1 Message Date
Vincent Petry 02b9bad81b Fix bogus deletion on copy + unlink through rename
Cross-storage rename would cause copy + unlink. That unlink operation
must not trigger the trashbin.
2015-01-26 12:22:22 +01:00
Vincent Petry a1cc9eea56 Add trashbin storage wrapper unit test for versions 2015-01-23 18:39:21 +01:00
Vincent Petry 1f39a7aabe Simplify trash storage unit tests
Needed to make it properly init the mount points
2015-01-23 18:08:59 +01:00
Vincent Petry 1a06edd712 Unregister trashbin storage wrapper at the end of tests
Some more tests that uses the storage wrapper now remove it afterwards
2015-01-23 15:36:09 +01:00
Robin Appelman 87a1b2bdc4 Preserve mtime when doing cross storage move 2015-01-23 15:11:27 +01:00
Vincent Petry 2e8c70327a Remove storage wrapper for oc_trashbin in unit test 2015-01-23 14:55:38 +01:00
Robin Appelman 91f3952ac1 Only move files from the current user to the trashbin 2015-01-23 14:19:36 +01:00
Vincent Petry 67f1534e0f Call final unlink in trash wrapper's storage
In the case of cross-storage delete, the files are copied to the trash,
then deleted. The final delete on the source storage would still reach
the trash wrapper.

This fix makes forwards that second call to the wrapped storage to make
the final delete work.

It fixes the issue with remote shares, local shares and external
storage.

Also, it uses a new function "renameRecursive" that renames the files
and preserves the mtimes (like "copy_recursive" did in the past))
2015-01-23 12:20:54 +01:00
Jenkins for ownCloud b8ab21d3ad [tx-robot] updated from transifex 2015-01-21 01:55:15 -05:00
Lukas Reschke 2ed2a7c7a8 Merge pull request #13520 from owncloud/fix-comparison-op
this must be larger then (>), since buggy behaviour occurs when the para...
2015-01-20 20:15:04 +01:00
Arthur Schiwon 9cb1ef5675 this must be larger then (>), since buggy behaviour occurs when the parameter is a small number 2015-01-20 17:50:53 +01:00
Thomas Müller 87a754c72e avoid $this->cache being null - fixes #13491 2015-01-20 12:38:54 +01:00
Jenkins for ownCloud 2ac015256f [tx-robot] updated from transifex 2015-01-20 01:54:37 -05:00
Morris Jobke 870bc429b2 Merge pull request #13416 from owncloud/reauthenticate-if-session-differs-from-basic-auth
Prioritise Basic Auth header over Cookie
2015-01-19 22:23:02 +01:00
Morris Jobke 2229290cca fix typo of blog -> changed to block
* fixes #13460
2015-01-19 15:57:53 +01:00
Thomas Müller 1810ea2d33 Merge pull request #13461 from owncloud/remove-strip-slashes
Remove stripslashes() from newfolder.php
2015-01-19 14:47:34 +01:00
Lukas Reschke 003fc183a2 Remove stripslashes() from newfolder.php 2015-01-19 14:12:36 +01:00
Morris Jobke cd4c7fd11f Merge pull request #13377 from owncloud/trashbin_storage_wrapper
[trashbin] replace hook with storage wrapper
2015-01-19 13:17:52 +01:00
Thomas Müller d75af7ddd2 Merge pull request #13362 from owncloud/fix-11442
LDAP Wizared: update user or group count only, when the multiselect is closed
2015-01-19 12:22:24 +01:00
Bjoern Schiessle 15ae6b47ed replace hook with storage wrapper 2015-01-19 09:16:15 +01:00
Jenkins for ownCloud 3404bd8cdd [tx-robot] updated from transifex 2015-01-19 01:54:31 -05:00
Morris Jobke aff22b3225 Merge pull request #13276 from Sugaroverdose/fix_#11348
fix safari rename button positioning #11348
2015-01-18 21:42:06 +01:00
Lukas Reschke 48126c3f54 Merge pull request #13433 from owncloud/favoritesl10n
fix unlocalized favorites browser title and alttext
2015-01-18 20:36:19 +01:00
Thomas Müller 3d6f4ac24e Merge pull request #13457 from owncloud/enc-skippartfiles
Skip stray part files during initial encryption
2015-01-19 14:40:21 +01:00
Vincent Petry 7a1ab3bb5e Add class attribute types in encryption Util class 2015-01-19 13:01:52 +01:00
Vincent Petry 7c3c26ab94 Skip stray part files during initial encryption 2015-01-19 13:01:37 +01:00
Jenkins for ownCloud 31cd5185f1 [tx-robot] updated from transifex 2015-01-18 01:54:34 -05:00
Volkan Gezer d253ef51a5 fix unlocalized favorites browser title and alttext 2015-01-17 16:52:36 +01:00
Lukas Reschke dfbc405a45 Prioritise Basic Auth header over Cookie
There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header.

This patch adds a workaround the following way:

1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF)
2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth

Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well.

This requires proper testing also considering LDAP / Shibboleth and whatever instances.
2015-01-17 13:29:07 +01:00
Jenkins for ownCloud 60c4cb1dd6 [tx-robot] updated from transifex 2015-01-17 01:54:40 -05:00
Sugaroverdose 141908bd9c Add ie8 text-overflow: ellipsis support
minimum browser window width ≈ 1280px
2015-01-17 01:43:42 +03:00
Sugaroverdose b2879d3a99 use some magic to make 'popular browsers' work
as expected with inline-block span
2015-01-16 23:36:35 +03:00
Morris Jobke 48ad4ba9a0 Fixes shifted rename field 2015-01-16 17:32:18 +01:00
Jan-Christoph Borchardt b81c89d400 compress icons of LDAP and WebDAV-Auth 2015-01-16 14:43:27 +01:00
Jan-Christoph Borchardt 7624b395f2 add icon for Provisioning API 2015-01-16 14:43:14 +01:00
Morris Jobke 1c4668f808 Merge pull request #13399 from owncloud/trashbin-fixpreviewroute
Fix preview route for trashbin
2015-01-16 13:48:02 +01:00
Sergei Shuykov 4d2ae71bf2 fix_#11348 Safari rename button positioning 2015-01-16 14:43:34 +03:00
Jenkins for ownCloud a65f666834 [tx-robot] updated from transifex 2015-01-16 01:55:51 -05:00
Vincent Petry a76f0a0ba7 Fix preview route for trashbin 2015-01-15 18:45:24 +01:00
Vincent Petry 7f24e77cfc Disallow ctrl click to select when selection not allowed 2015-01-15 18:16:27 +01:00
Vincent Petry d40301492d Auto-blur when clicking on file to download 2015-01-15 18:08:36 +01:00
Vincent Petry 7d81299014 Fixed thumbnal z-index for when no checkbox is there
In file lists with no selection checkbox, the CSS selector is different.
The thumbnail also needs position:absolute and a z-index to be displayed
above the row's grey highlight.
2015-01-15 17:53:23 +01:00
Arthur Schiwon 56ba07aa5c coding style 2015-01-15 12:25:36 +01:00
Thomas Müller 2fbe8bbcba Merge pull request #13370 from Sugaroverdose/fix_#13322
Force browser to redraw favorite icon on src change
2015-01-15 11:20:22 +01:00
Morris Jobke 9b7c1a0093 Merge pull request #13347 from owncloud/share-scanpermissionsfromsource
Use source storage permissions when scanning shared storage
2015-01-15 11:15:15 +01:00
Sugaroverdose b2de3b3d8d Force browser to redraw favorite icon
on src change
2015-01-15 12:26:55 +03:00
Jenkins for ownCloud 4c233fef2a [tx-robot] updated from transifex 2015-01-15 01:54:41 -05:00
Robin McCorkell 9d0915013b Merge pull request #13352 from owncloud/hhvm-array-key
HHVM: Do not use key() on array as the result depends on the internal array pointer.
2015-01-15 01:06:45 +00:00
Andreas Fischer b4a52e889a Do not use key() on array as the result depends on the internal array pointer. 2015-01-15 00:48:10 +01:00
Morris Jobke 455ad005a0 Merge pull request #13350 from owncloud/autoload-translations
Autoload app's js translations
2015-01-14 18:12:05 +01:00