Commit Graph

9679 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
Joas Schilling d6939d67da Remove duplicated definition of APIController 2015-01-26 10:20:01 +01:00
Jenkins for ownCloud a698637e91 [tx-robot] updated from transifex 2015-01-25 01:54:38 -05:00
Jenkins for ownCloud b8e1dd9c87 [tx-robot] updated from transifex 2015-01-24 01:54:51 -05:00
Bjoern Schiessle 73a058e301 by default send mail for new server-to-server share 2015-01-23 21:59:07 +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
Joas Schilling 7e6d2c73d2 Ignore favorites that are not available when creating the favorites list
Also correctly return the exception for all cases when adding/removing favos
2015-01-23 10:11:14 +01:00
Jenkins for ownCloud bc93a8f140 [tx-robot] updated from transifex 2015-01-23 01:55:06 -05:00
Arthur Schiwon 9c7cd702c3 user fs must be setup up, so that the real user folder is mounted on the username based path 2015-01-22 19:16:28 +01:00
Thomas Müller fc1865449d adding console command to migrate encryption keys - refs #13450 2015-01-22 16:10:45 +01:00
Jenkins for ownCloud 5f3c6a97b2 [tx-robot] updated from transifex 2015-01-22 01:55:09 -05:00
Morris Jobke c931eafc1f Merge pull request #13517 from owncloud/keymanager-storage
Bypass the view when storing encryption keys
2015-01-22 00:41:48 +01:00
Morris Jobke 4dac664002 Merge pull request #13568 from owncloud/s2s_delete_shares_jenkins
[ignore] delete all server-to-server shares if a user gets deleted
2015-01-22 00:37:39 +01:00
Lukas Reschke 762949afd9 Make naming of encryption app consistent
Fixes https://github.com/owncloud/core/issues/13580
2015-01-21 23:29:09 +01:00
Bjoern Schiessle 7216983a08 delete all server-to-server shares if a user gets deleted 2015-01-21 17:11:34 +01:00
Thomas Müller 8ba42abbe4 Merge pull request #13432 from owncloud/animate_gifs_public_sharing
show animated gifs on public sharing page
2015-01-21 17:09:46 +01:00
Thomas Müller 9921308c62 Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialog
External share dialog must properly read entered password
2015-01-21 16:51:56 +01:00
Vincent Petry c48307027c Fixed external cache test namespace 2015-01-21 15:52:56 +01:00
Vincent Petry 9fbdd1072e Fix webdav mkdir for remote shares 2015-01-21 15:14:57 +01:00
Vincent Petry f3d696599a Add unit test for external share JS dialog
Moved external share JS code into a small plugin to make it testable.

Added unit test for the external share dialog logic + ajax calls.
2015-01-21 11:26:54 +01:00
Vincent Petry 23ea45760f External share dialog must properly read entered password 2015-01-21 11:26:36 +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
Robin Appelman 750cff0e3e Bypass the view when storing encryption keys 2015-01-20 16:20:49 +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
Ross Nicoll 1c2cbf6fc6 Align checkbox configuration in external files
Modified CSS for files_external application to render labels around checkboxes at the same
width as other input elements, aligning them with other elements on the same page.
2015-01-19 17:01:25 +00:00
Georg Ehrke 374ddbff55 show animated gifs on public sharing page 2015-01-19 16:20:06 +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
Vincent Petry a9f0582e3e Use source storage permissions when scanning shared storage 2015-01-14 18:11:23 +01:00
Arthur Schiwon 3d94aa8953 update user or group count only, when the multiselect is closed 2015-01-14 17:31:20 +01:00
Arthur Schiwon 672bc28715 allow to read again objectclasses and groups under certain conditions 2015-01-14 15:15:55 +01:00
Lukas Reschke 01304aa27e Merge pull request #13351 from owncloud/check-for-existence
Check for existence of $_GET keys
2015-01-14 15:00:25 +01:00
Vincent Petry 87f81e5926 Remove unneeded addTranslations() calls 2015-01-14 14:36:23 +01:00
Lukas Reschke 96cd7c017a Check for existence of $_GET keys
`$dir` may for example very well not get passed at well.
2015-01-14 14:16:18 +01:00
Thomas Müller 25806346c2 remove deprecated code - fixes #13119 2015-01-14 13:56:49 +01:00
Morris Jobke 3a6d2fcc10 Merge pull request #13345 from owncloud/increase-files-external-versions
Increase files_externals oC required version and its own version
2015-01-14 13:24:08 +01:00
Thomas Müller 9b7421972b Merge pull request #13332 from oparoz/fix-download-button
Download the current public folder only
2015-01-14 12:24:06 +01:00
Joas Schilling f031a479ad Increase files_externals oC required version and its own version 2015-01-14 12:21:47 +01:00
Björn Schießle 9a487f0445 Merge pull request #13286 from owncloud/sharing_upgrade
update script for new server-to-server sharing
2015-01-14 11:57:30 +01:00
Lukas Reschke 64ee942e7d Merge pull request #13288 from owncloud/enc_fix_public_download
[encryption] fix download of public shared files
2015-01-14 11:55:13 +01:00
Thomas Müller e2a3547127 Merge pull request #13335 from owncloud/disable-rememberme-files-external
The files_external app might need the password so autologin must be disabled
2015-01-14 11:51:16 +01:00
Björn Schießle 5745b68fa9 Merge pull request #13311 from owncloud/fix_restore_keys
adapt decrypt all to the new folder structure
2015-01-14 11:40:22 +01:00
Olivier Paroz 356bfb36dc Download the current public folder only
From within a shared/public directory, when drilling down folders, some
users want to be able to download what they're currently looking at, not
the whole shared folder. The whole archive is always a click away anyway
since a user can click on the home button.
2015-01-14 11:28:36 +01:00
Joas Schilling caaae1094f The files_external app might need the password so autologin must be disabled 2015-01-14 10:19:22 +01:00
Morris Jobke 65ee2b1de8 Merge pull request #13325 from owncloud/kill-strip-slashes
Get rid of `stripslashes()`
2015-01-14 08:27:42 +01:00
Jenkins for ownCloud f367bbb49d [tx-robot] updated from transifex 2015-01-14 01:55:16 -05:00
Arthur Schiwon 51d783ca6e JS cleanup 2015-01-13 18:39:37 +01:00
Lukas Reschke 3ff3f641d6 Get rid of `stripslashes()`
This conversions are actually totally unneeded and probably left-overs from ages where the safe_mode was still a valid thing.
2015-01-13 17:43:36 +01:00
Bjoern Schiessle d50e70ba3a set accept to 1 (=true) for all server-to-server shares on update, at this point in time all shares are created by the first version of server-to-server sharing and are accepted if they were added to the table 2015-01-13 17:24:00 +01:00
Lukas Reschke 4766dac6f4 Fix PHP doc and enforce type 2015-01-13 14:47:54 +01:00
Bjoern Schiessle 83574053a3 if we download a public shared file we need to retrieve the user from the path 2015-01-13 14:22:54 +01:00
Joas Schilling 6d73aff9ad Merge pull request #13277 from owncloud/pasteurl
add https:// placeholder for From Link feature. closes #13255
2015-01-13 12:51:58 +01:00
Bjoern Schiessle 89f17ef6fe adapt decrypt all and restore/delete key backups to the new folder structure for encryption key introduced with OC8 2015-01-13 12:45:33 +01:00
Morris Jobke c4aeb0b5b5 Merge pull request #13289 from owncloud/fav-keepfavoncancelrename
Properly update internal file info with updated tags
2015-01-13 08:28:30 +01:00
Jenkins for ownCloud 3ece0a7767 [tx-robot] updated from transifex 2015-01-13 01:56:58 -05:00
Thomas Müller d20a1bbdbf Merge pull request #13154 from owncloud/fix13141
don't show no files yet when mask is in place, fixes #13141
2015-01-12 22:48:25 +01:00