Commit graph

28985 commits

Author SHA1 Message Date
Thomas Müller
db41c4f4b5 Merge pull request #21181 from owncloud/files-fixsharedrootdetection
Fix mount type root detection in web UI
2015-12-14 13:50:35 +01:00
Thomas Müller
96b28382d9 Merge pull request #21148 from owncloud/resetpassword-user-issert
Check if user isset in $_REQUEST first
2015-12-14 11:27:46 +01:00
Vincent Petry
4d9e12b8bc Fix mount type root detection
Since Webdav doesn't contain that information, we need to rely on the
parent folder's mount type to find out whether a child item is a
shared/external root or not.

Fixed the mount type detection logic and added unit test.

Also added a fix that ignores detection if no parent folder exists (ex:
shared file list, favorites, etc)
2015-12-14 10:44:47 +01:00
Thomas Müller
583e696c9e Merge pull request #21163 from owncloud/fix_20839
Files can't have create permissions
2015-12-14 10:25:27 +01:00
Robin Appelman
9d732e35e1 Check if user isset in $_REQUEST first 2015-12-14 09:56:52 +01:00
Jenkins for ownCloud
74de12c698 [tx-robot] updated from transifex 2015-12-13 01:54:51 -05:00
Jenkins for ownCloud
f2ac1a80d8 [tx-robot] updated from transifex 2015-12-12 01:55:39 -05:00
Roeland Jago Douma
e8d5eb65c6 Files can't have create permissions
Fixes #20839
2015-12-11 22:28:26 +01:00
Thomas Müller
aee4887224 Merge pull request #21153 from owncloud/files-deleteactiontext
Bring back file delete action text to be based on context
2015-12-11 16:04:06 +01:00
Morris Jobke
2fa97f69cb Merge pull request #20081 from owncloud/trashbin-loggedout
Fix trashbin wrapper when no user is loggedin
2015-12-11 15:55:50 +01:00
Vincent Petry
baa5a69c55 Bring back file delete action text to be based on context
For received shares, the delete action becomes "Unshare" and for
personal mounts it becomes "Disconnect storage".

This also makes it possible from now on to pass a function to a file
action's "displayName" attribute.
2015-12-11 15:14:30 +01:00
Robin Appelman
5b2957bad1 skip test if we cant use the filesystem when not logged in 2015-12-11 14:29:38 +01:00
Robin Appelman
415cf92784 Fix thrashbin wrapper when no user is loggedin 2015-12-11 14:27:37 +01:00
Thomas Müller
4f860b7e0a Merge pull request #20978 from owncloud/fix-dont-show-unsaved-values-in-usermgmt
reset mailadress/displayname on blur
2015-12-11 12:15:01 +01:00
Thomas Müller
f831d93f3f Merge pull request #20878 from owncloud/proper-htaccess-support-in-code-signing-checker
Also run .htaccess routine when installing on another system than Apache
2015-12-11 11:46:37 +01:00
Thomas Müller
f799b27f0e Merge pull request #21144 from owncloud/dav-auth-checkduplicateheader
Properly check X-Requested-With header in case of multiple values
2015-12-11 11:44:43 +01:00
Thomas Müller
6317ba8cb4 Merge pull request #21135 from owncloud/add-polyfill
Add polyfills for PHP55, PHP56 and PHP70 functionalities
2015-12-11 11:40:51 +01:00
Thomas Müller
86bd95ea1b Merge pull request #21020 from owncloud/add-directory-slash-to-setup-code
Add DirectorySlash to dynamic .htaccess write
2015-12-11 11:40:32 +01:00
Thomas Müller
c14f4e8506 Merge pull request #21045 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-12-11 11:39:25 +01:00
Vincent Petry
13ec2bda2d Properly check X-Requested-With header in case of multiple values
Saw this happening in IE8...
2015-12-11 11:22:38 +01:00
Thomas Müller
6a179c42ba Merge pull request #21087 from owncloud/catchexceptionindirectdownloadurl
Catch exception when querying direct download link
2015-12-11 10:48:54 +01:00
Thomas Müller
ecc3c174a0 Merge pull request #21128 from owncloud/dav-fopen-non-existing
Dont do a seperate request to check if a file exists when downloading a file from dav external storage
2015-12-11 10:48:22 +01:00
Thomas Müller
c022128630 Merge pull request #21131 from owncloud/update-public-api
IMemcacheTTL was backported to 8.2.2
2015-12-11 10:46:46 +01:00
Thomas Müller
aa476d6d2a Merge pull request #21137 from owncloud/update-issue-template.md
Update issue template.md
2015-12-11 10:46:03 +01:00
Lukas Reschke
2f3b10f980 Adjust third-party reference 2015-12-11 10:20:09 +01:00
Joas Schilling
0f122dcefe Remove steps for ownCloud 6 2015-12-11 09:59:38 +01:00
Joas Schilling
60071ef040 Fix the sample occ config call 2015-12-11 09:56:24 +01:00
Lukas Reschke
f3360d51c6 Use PHP polyfills 2015-12-11 08:47:36 +01:00
Jenkins for ownCloud
acce1638e5 [tx-robot] updated from transifex 2015-12-11 01:55:44 -05:00
Morris Jobke
4569d88879 IMemcacheTTL was backported to 8.2.2
see #21113
2015-12-10 19:00:07 +01:00
Thomas Müller
ae6c3c1539 Merge pull request #21123 from owncloud/remove-db-locking-performance-warning-master
Remove info about database locking performance
2015-12-10 17:24:43 +01:00
Robin Appelman
97f5c095f4 Dont do a seperate request to check if a file exists for dav->fopen 2015-12-10 17:23:53 +01:00
Thomas Müller
ab1ea5ccc4 Merge pull request #21119 from owncloud/make-appconfig-more-robust
Make AppManager->checkAppForUser more robust
2015-12-10 16:44:40 +01:00
Thomas Müller
19d1e0ebb9 adjust PHPDoc 2015-12-10 16:43:37 +01:00
Scrutinizer Auto-Fixer
ffc49a24f0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-10 16:43:37 +01:00
Vincent Petry
174f7599e5 Catch exception when querying direct download link 2015-12-10 16:17:44 +01:00
Thomas Müller
7094ed05ad Merge pull request #21114 from owncloud/group-propagation-tests
Add test case for group share propagation
2015-12-10 16:16:20 +01:00
Thomas Müller
7634c45e39 Merge pull request #21086 from owncloud/storage-nocheckavailforgetowner
Do not check storage availability for getOwner
2015-12-10 16:15:52 +01:00
Thomas Müller
01b9f07ac8 Remove info about database locking performance 2015-12-10 16:10:45 +01:00
Morris Jobke
f5e6c75804 Make AppManager->checkAppForUser more robust
* if the JSON that is stored in the DB is corrupt an error was thrown
* with this change it is properly handled and the app is disabled
2015-12-10 14:53:34 +01:00
Robin Appelman
3d5a7b307f Add test case for group share propagation 2015-12-10 13:53:50 +01:00
Thomas Müller
df15d54db6 Merge pull request #21072 from owncloud/db-lock-ttl
Remove all locks after ttl from the db
2015-12-10 13:51:18 +01:00
Thomas Müller
744ef6141b Merge pull request #21073 from owncloud/memcache-lock-ttl
Add ttl for redis based locking
2015-12-10 13:51:01 +01:00
Morris Jobke
3c2a637d66 Merge pull request #21109 from owncloud/proper-version-expire-dedup
Deduplicate version expire jobs
2015-12-10 13:29:28 +01:00
Morris Jobke
fb87441fd9 Deduplicate version expire jobs
* versionSize is calculated anyway in the expire job - > dropped
* offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation
* fixes #21108
2015-12-10 11:21:28 +01:00
Thomas Müller
75c3d64635 Merge pull request #21105 from owncloud/fix-risky-test-comments
Add assertion to test
2015-12-10 11:02:27 +01:00
Thomas Müller
e5dbddaab8 Merge pull request #21071 from owncloud/fix-swift-unit-test-execution-master
Looks like ceph requires more time to come up ....
2015-12-10 10:59:58 +01:00
Thomas Müller
6ca9444b49 Merge pull request #20893 from owncloud/test_sharing_file_by_multiple_channels
Added shared by multiple channels test
2015-12-10 10:36:12 +01:00
Thomas Müller
9f4ceef7c9 Merge pull request #20984 from owncloud/fix-mysql-setup-unix-socket-master
Add unix_socket support for mysql during initial installation - fixes…
2015-12-10 10:13:49 +01:00
Thomas Müller
292a702452 Merge pull request #21104 from owncloud/make-compatible-with-phpunit-5-1
Make compatible with PHPUnit 5.1
2015-12-10 10:01:49 +01:00