Commit Graph

25822 Commits

Author SHA1 Message Date
Bjoern Schiessle 06d0a41915 add social media button for diaspora, twitter, facebook and google+ 2015-06-17 13:53:59 +02:00
Vincent Petry a89bb1d383 Merge pull request #16988 from owncloud/fix-avatar-fail
Fix remaining avatar problems
2015-06-17 13:20:29 +02:00
Lukas Reschke 21d261885d Fix test 2015-06-17 12:11:09 +02:00
Thomas Müller e6e9370eb6 Merge pull request #16985 from owncloud/fix-public-api-phpdoc
Fix OCP PHPDoc
2015-06-17 12:04:08 +02:00
Lukas Reschke 70ca0102f5 Fix PHPDoc annotations 2015-06-17 11:57:12 +02:00
Lukas Reschke 123807bff7 Correc type annotation 2015-06-17 11:55:15 +02:00
Thomas Müller d2305f2527 Merge pull request #16729 from owncloud/scanner-read-lock
keep a read lock while scanning a file or folder
2015-06-17 11:52:54 +02:00
Morris Jobke 9e506abec3 Fix OCP PHPDoc
* was always a string instead of \OCP\IUser
2015-06-17 11:10:55 +02:00
Jenkins for ownCloud 3898b8c9b8 [tx-robot] updated from transifex 2015-06-17 01:55:34 -04:00
Hendrik Leppelsack e8507372e3 let buttons hide the sidebar 2015-06-16 19:41:20 +02:00
Vincent Petry de5c84580b Merge pull request #16955 from owncloud/lock-changelocktrimpath
Trim path in changeLock
2015-06-16 18:18:17 +02:00
Vincent Petry 102c6ffc41 Normalize path in View's lock methods 2015-06-16 17:03:12 +02:00
Bjoern Schiessle b645d795d2 add occ tool to delete versions 2015-06-16 16:56:27 +02:00
Vincent Petry e5d34a2733 Merge pull request #16892 from owncloud/lock-returnfullpath
Rethrow LockedException with full path
2015-06-16 16:47:10 +02:00
Lukas Reschke 829f6474ff Merge pull request #16856 from owncloud/issue-15851-fetch-updates-after-page-completion
Load the update information asyncroniously to fix the page load speed
2015-06-16 11:41:44 +02:00
Joas Schilling 497fe93b6c Do not return backends but add a method to check for one 2015-06-16 11:31:04 +02:00
Joas Schilling 171f86ca2e Only sort by group name when LDAP is involved 2015-06-16 11:10:00 +02:00
Joas Schilling fee62ac61c Always keep "Everyone" and "admin" at the top of the list 2015-06-16 11:10:00 +02:00
Joas Schilling 7d8b728066 Merge pull request #16832 from owncloud/memcache-fail
Throw exception if memcache misconfigured or missing
2015-06-16 11:00:18 +02:00
Joas Schilling 60005bea19 Merge pull request #16943 from owncloud/sabre-convertinvalidpath
Convert invalid path exception to sabre exception on MOVE
2015-06-16 10:49:22 +02:00
Vincent Petry 0e3a3dd5d7 Rethrow LockedException with full path
Because the path is converted to md5 from the original exception,
rethrow the exception with the correct full path
2015-06-16 10:48:31 +02:00
Morris Jobke b052eccd9a Merge pull request #16938 from owncloud/ext-s3-opendirduplicate
Skip directory entry in S3 opendir
2015-06-16 09:48:10 +02:00
Jenkins for ownCloud 0a5d73b874 [tx-robot] updated from transifex 2015-06-16 01:55:41 -04:00
Thomas Müller e9d11a65e0 Merge pull request #16944 from owncloud/fix-avatars
Reintroduce user cache
2015-06-15 21:16:04 +02:00
Lukas Reschke fffef529ee Adjust NullCache tests 2015-06-15 19:17:50 +02:00
Lukas Reschke 34f5541088 Add `no-store` to AppFramework 2015-06-15 18:35:41 +02:00
Lukas Reschke 15ba2a4100 Reintroduce user cache
This was required by avatars and was broken with https://github.com/owncloud/core/pull/16200

Fixes https://github.com/owncloud/core/issues/16942
2015-06-15 17:54:48 +02:00
Vincent Petry 1f91e9e65d Convert invalid path exception to sabre exception on MOVE 2015-06-15 17:49:11 +02:00
Vincent Petry f98030020f Properly set mtime on S3 for touch operation
The code was missing the "MetadataDirective".
Once added, some other parts of the code failed because the format of mtime was wrong.
So this PR uses the RFC format that the S3 library already uses.

Additionally, the code path where mtime is null was missing. Now defaulting to
the current time.
2015-06-15 17:35:09 +02:00
Vincent Petry d3f828af45 Skip directory entry in S3 opendir
The result set contains the directory itself, so skip it to avoid
scanning a non-existing directory
2015-06-15 17:30:09 +02:00
Robin Appelman f02e110aea explain pre-hook scan 2015-06-15 15:43:19 +02:00
Robin Appelman 4b181f73ca phpdoc 2015-06-15 15:41:52 +02:00
Thomas Müller 4bc35286ff Merge pull request #16931 from owncloud/make-security-checks-more-stringent
Align recommended settings
2015-06-15 15:15:28 +02:00
Robin Appelman 567df226e5 fix check if hooks should be emited in runHooks 2015-06-15 15:07:48 +02:00
Robin Appelman 9c0d69a3b2 ensure normalized path form when changing locks 2015-06-15 14:32:29 +02:00
Robin Appelman 5efbab4ab8 ensure we dont have to scan a file in the trash wrapper 2015-06-15 14:32:29 +02:00
Robin Appelman a4f808b11d properly unlock in case of failed fopen 2015-06-15 14:32:29 +02:00
Robin Appelman 7d72f7d8ce keep a read lock while scanning a file or folder 2015-06-15 14:32:29 +02:00
Thomas Müller 911c43e5f9 Merge pull request #16727 from owncloud/file-put-content-lock
add proper locking to file_put_contents when using streams
2015-06-15 14:22:06 +02:00
Thomas Müller 5eb0dace8c Merge pull request #16802 from Brewal/master
Fixed "p" element containing a "div"
2015-06-15 14:10:00 +02:00
Thomas Müller de3ed8e077 Merge pull request #16821 from owncloud/compare-and-delete-locking-watch
Compare and delete locking watch
2015-06-15 14:09:06 +02:00
Thomas Müller 433db48027 Merge pull request #16911 from oparoz/prettier-public-thumbnails
Determine the size we need before asking for a thumbnail
2015-06-15 13:30:44 +02:00
Thomas Müller b8ab6fb68d Merge pull request #16915 from aidanamavi/add-opus-mimetype
Added Opus Mimetype Support
2015-06-15 13:27:44 +02:00
Thomas Müller 3ce616fb03 Merge pull request #16885 from owncloud/files-previewurlresolutionrounding
Truncate preview resolution
2015-06-15 12:53:05 +02:00
Thomas Müller b6165b6865 Merge pull request #16912 from owncloud/webdav-smalltransferlockfix
Webdav PUT small file lock must be shared during hooks
2015-06-15 11:30:59 +02:00
Lukas Reschke eec8d776b7 Align recommended settings
This aligns the recommended setting with the max-age of `15768000` as described in our documentation. Furthermore it fixes some logical problems with the code, unit tests has been added as well.

Fixes https://github.com/owncloud/core/issues/16673
2015-06-15 10:39:25 +02:00
Joas Schilling 5ca6ec7ead Make "include update info" part of the cache key 2015-06-15 10:04:13 +02:00
Jenkins for ownCloud 2806c9476c [tx-robot] updated from transifex 2015-06-15 01:54:58 -04:00
Robin Appelman 2fb8a76705 add recursive copy polyfill for storage backends 2015-06-14 15:15:21 +02:00
Jenkins for ownCloud fe9b28a800 [tx-robot] updated from transifex 2015-06-14 01:54:49 -04:00