Commit graph

23839 commits

Author SHA1 Message Date
Morris Jobke
f4dc9e6bf3 Merge pull request #15155 from owncloud/share-donotreturntrashedfiles
Do not return shares for files outside "files"
2015-03-27 17:05:14 +01:00
Thomas Müller
4d12c4a38b Merge pull request #13938 from owncloud/deprecate-iappconfig
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
Vincent Petry
23cb8112fc Add logout in share test to avoid nasty side effects 2015-03-27 15:54:29 +01:00
Thomas Müller
722e50a112 Merge pull request #15240 from owncloud/storage-wrapper-priority
add priority to storage wrappers
2015-03-27 15:18:44 +01:00
Thomas Müller
5db932d1e4 Merge pull request #15261 from owncloud/fix-14268-master
use StreamResponse to download the log file
2015-03-27 15:07:50 +01:00
Thomas Müller
98bc1ad70a Merge pull request #15265 from owncloud/enc2_fixes
core improvements for Encryption 2.0
2015-03-27 14:58:33 +01:00
Morris Jobke
e918bcf212 Merge pull request #15247 from owncloud/fix_group_share_master_backport
also call generateTarget for group shares
2015-03-27 14:40:52 +01:00
Thomas Müller
0ecc1c89ad Merge pull request #15254 from owncloud/fix-14853-master
Adding a pending indicator to the files summary
2015-03-27 14:18:47 +01:00
Vincent Petry
4d57b7bb3c Merge pull request #15259 from owncloud/fix-change-password-ie8
Show label for password change in IE8
2015-03-27 14:11:14 +01:00
Vincent Petry
80f83ab5e0 Do not return shares for files outside "files" 2015-03-27 13:25:23 +01:00
Vincent Petry
7ad4dfa201 Merge pull request #15227 from owncloud/ocetag-header
Copy Etag header to OC-Etag for sabre calls
2015-03-27 13:10:27 +01:00
Morris Jobke
5aa81833f9 Merge pull request #15260 from owncloud/adjust-controls-bar-width
adjust controls bar width to not overlay scrollbar
2015-03-27 11:56:22 +01:00
Bjoern Schiessle
b5fad75e57 add deleteAllFileKeys to public interface and add "uid" as parameter for the
update call
2015-03-27 11:51:53 +01:00
Bjoern Schiessle
c6be1ba8d3 fix check if a file is excluded from encryption or not 2015-03-27 11:51:50 +01:00
Thomas Müller
b5545932e7 use StreamResponse to download the log file - fixes #14268 2015-03-27 11:30:32 +01:00
Morris Jobke
7e73b25533 Merge pull request #15258 from owncloud/users-addtofilteredgroup
Don't append user in a filtered list if groups don't match
2015-03-27 10:02:33 +01:00
Morris Jobke
a62f38a18b Merge pull request #15225 from owncloud/make-setups-for-users-that-tend-to-use-owncloud-on-not-proper-machines-a-little-bit-more-secure
Add some generic default headers as well via PHP
2015-03-27 09:54:40 +01:00
Jan-Christoph Borchardt
701cb27a9e fix scrutinizer issues 2015-03-27 09:38:41 +01:00
Jenkins for ownCloud
880b31c513 [tx-robot] updated from transifex 2015-03-27 01:56:21 -04:00
Jan-Christoph Borchardt
d728b85fdd adjust controls bar width to not overlay scrollbar 2015-03-27 01:34:55 +01:00
Thomas Müller
fb8994603b Merge pull request #15252 from owncloud/prevent-directory-characters-in-temporary-path
Filter potential dangerous characters in path name
2015-03-27 01:19:55 +01:00
Thomas Müller
710498402f Merge pull request #15256 from owncloud/emptycontent-messages
fine-tuning the empty content messages
2015-03-27 01:17:46 +01:00
Morris Jobke
3e8343c07c Show label for password change in IE8
* fixes #10729
2015-03-27 01:16:31 +01:00
Thomas Müller
2b0906cdff Adding a pending indicator to the files summary - fixes #14853 2015-03-27 01:16:29 +01:00
Morris Jobke
f72939df91 Merge pull request #15255 from owncloud/test-namespacesforrepairtests
Fix namespace for repair step tests
2015-03-27 00:16:47 +01:00
Vincent Petry
ea93356598 Don't append user in a filtered list if groups don't match 2015-03-27 00:09:35 +01:00
Thomas Müller
055c18a7b4 Merge pull request #15245 from owncloud/fix-14864-master
More elaborate command description for upgrade
2015-03-26 23:50:06 +01:00
Jan-Christoph Borchardt
6b4985f5ad adjust shade of empty content icons, fix files icon shade 2015-03-26 23:49:32 +01:00
Jan-Christoph Borchardt
e09fd331eb adjust emptycontent messages for files and files_external 2015-03-26 23:22:26 +01:00
Vincent Petry
cf2fd2a825 Fix namespace for repair step tests 2015-03-26 23:19:27 +01:00
Lukas Reschke
9622fbdf29 Filter potential dangerous characters in path name
We should not allow / or \ in the postfix here.
2015-03-26 23:17:18 +01:00
Vincent Petry
746be98e03 Merge pull request #13654 from oparoz/tmpfile-with-extension
Keep the extension in temp files
2015-03-26 23:08:08 +01:00
Morris Jobke
d082e37270 Merge pull request #15244 from owncloud/use_default_share_folder
always fall back to default share folder
2015-03-26 22:39:04 +01:00
Robin McCorkell
c2909355bf Merge pull request #14925 from owncloud/ext-mountoptions-ui
Mount options GUI for external storage
2015-03-26 21:36:34 +00:00
Lukas Reschke
9d1ce53cb1 Add some generic default headers as well via PHP 2015-03-26 22:32:57 +01:00
Bjoern Schiessle
223cca2a07 also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php 2015-03-26 22:31:45 +01:00
Thomas Müller
a4171b295d More elaborate command description for upgrade - fixes #14864 2015-03-26 22:30:35 +01:00
Jan-Christoph Borchardt
fc59a37ae7 Merge pull request #14918 from owncloud/fix-password-change-ie8-and-9
Don't use placeholder for password in IE8 & 9
2015-03-26 22:06:22 +01:00
Morris Jobke
e8109f0bc3 Merge pull request #13802 from owncloud/share-partfilepermissions
Fix share permission checks
2015-03-26 22:01:05 +01:00
Bjoern Schiessle
a3592534ef always fall back to default share folder 2015-03-26 21:56:44 +01:00
Morris Jobke
4c00be4961 Merge pull request #14488 from owncloud/enhancement/security/inline-disposition
Serve all files with a Content-Disposition of 'attachment' via WebDAV
2015-03-26 21:45:30 +01:00
Robin Appelman
cb9ead7dde add priority to storage wrappers 2015-03-26 21:26:38 +01:00
Thomas Müller
7bff0681fe Merge pull request #15001 from owncloud/kill-share-proxy
Replace share proxy with a hook
2015-03-26 21:20:05 +01:00
Thomas Müller
232518ac54 Merge pull request #15234 from owncloud/encryption2_core
core part of encryption 2.0
2015-03-26 21:14:59 +01:00
Bjoern Schiessle
ff9c85ce60 implement basic encryption functionallity in core to enable multiple encryption modules 2015-03-26 20:56:51 +01:00
Lukas Reschke
8ebe667202 Remove unneeded argument 2015-03-26 20:45:39 +01:00
Thomas Müller
0cb133003c Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail
Remove IDE autocomplete fail
2015-03-26 20:21:26 +01:00
Morris Jobke
d3ed020d34 Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master
no php execution timeout for webdav
2015-03-26 20:18:01 +01:00
Lukas Reschke
74a9fc29b4 Merge pull request #14399 from owncloud/ignore-empty-plurals
Ignore empty plurals just like with singulars
2015-03-26 20:15:33 +01:00
Morris Jobke
0a589d938c fix enforced password for share in IE8 2015-03-26 20:05:41 +01:00