Commit Graph

25614 Commits

Author SHA1 Message Date
Joas Schilling 95faaad5cf Use the app constant to fix the grouping 2015-07-02 12:27:58 +02:00
Joas Schilling 7e3f8d3ac1 Use the item name when refering to the unaccepted remote share 2015-07-02 12:26:06 +02:00
Joas Schilling bfcb8ffeb3 Merge pull request #17246 from owncloud/share-lock-owner-parent
lock parent folders for the owner when locking a shared file as recipient
2015-07-02 10:38:08 +02:00
Thomas Müller 5580b0e7c0 Merge pull request #17310 from owncloud/master-remove-ocs-ids
[master] Remove OCS IDs
2015-07-02 09:19:33 +02:00
Lukas Reschke 68f8717056 [master] Remove OCS IDs
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307

Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
2015-07-02 08:45:16 +02:00
Morris Jobke 61a60ffd47 Merge pull request #17293 from owncloud/revert-z-index
Revert z-index changes
2015-07-02 08:21:54 +02:00
Jenkins for ownCloud d2e1cae331 [tx-robot] updated from transifex 2015-07-02 01:59:26 -04:00
Lukas Reschke ba9b214aaa Merge pull request #17295 from owncloud/scanfilesignature
Fix scanFile signature to avoid boring warning
2015-07-01 21:42:05 +02:00
Vincent Petry 9c06975bd5 Fix scanFile signature to avoid boring warning 2015-07-01 16:29:11 +02:00
Jan-Christoph Borchardt b80b1fbd24 Revert "fix z-index of share-autocomplete"
This reverts commit 4edf388a38.
2015-07-01 16:12:55 +02:00
Jan-Christoph Borchardt 75451927b5 Revert "explicitly set z-index on app-content, fix overlap from navigation"
This reverts commit 71e5bc1803.
2015-07-01 16:12:36 +02:00
Frank Karlitschek 2eb9936d77 This will be 8.2 in the future 2015-07-01 10:06:26 -04:00
Morris Jobke bad499baad Merge pull request #17252 from owncloud/fix-php-errors-in-app-description
Only do the description kung-fu on strings
2015-07-01 15:44:21 +02:00
Vincent Petry 709eca2085 Merge pull request #17268 from owncloud/files-cleanuppartfileonlyonce
Clean up part file only once, not twice on error
2015-07-01 15:20:53 +02:00
Robin Appelman 3c0be7d126 only lock the parent folders 2015-07-01 15:10:25 +02:00
Robin Appelman d6f56ea609 lock parent folders for the owner when locking a shared file as recipient 2015-07-01 15:10:22 +02:00
Lukas Reschke fb2ec1dc56 Merge pull request #17285 from Rechenzentrum-Universitaet-Augsburg/master
Changed broken links to php manual
2015-07-01 14:21:03 +02:00
Michael Roth 78e02045c1 Changed broken links to php manual 2015-07-01 14:13:18 +02:00
Thomas Müller aae55174f6 Only do the description kung-fu on strings - fixes #17028 2015-07-01 13:15:13 +02:00
Vincent Petry cf245b80fe Only delete part file on error if it is really a part file 2015-07-01 12:52:06 +02:00
Vincent Petry 5caeda33f1 Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes
Catch more error codes thrown by federated shares
2015-07-01 12:30:32 +02:00
Morris Jobke b476c125c0 Merge pull request #15363 from owncloud/ext-ocp
Use OCP classes as much as possible in files_external
2015-07-01 11:16:52 +02:00
Vincent Petry 5d3aa36355 Catch more error codes thrown by federated shares
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.

This prevents unpredictable error codes to block access to unrelated
folders needlessly.
2015-07-01 11:14:03 +02:00
Vincent Petry fd4efdded9 Clean up part file only once, not twice on error 2015-07-01 09:47:05 +02:00
Robin McCorkell 728a22cda1 Use OCP classes as much as possible in files_external 2015-07-01 09:08:28 +02:00
Morris Jobke b5c9196ffc Merge pull request #17088 from owncloud/add-verbosity-to-upgrade
[upgrade] add verbosity check and show repair info & steps
2015-07-01 08:56:06 +02:00
Morris Jobke 4e44cc49d9 Merge pull request #17093 from owncloud/upgrade-timestamp
[upgrade] show timestamp for output during upgrade
2015-07-01 08:55:32 +02:00
Morris Jobke da45fad3eb Merge pull request #17078 from owncloud/fix-initial-server-host
Fix undefined offset
2015-07-01 08:55:12 +02:00
Morris Jobke 8f05d4b662 Merge pull request #16535 from rullzer/ocs_share_api_url
OCS Share API link shares now always have an url
2015-07-01 08:54:48 +02:00
Morris Jobke 1469177a3a Merge pull request #16406 from owncloud/enc-strlenperffix
Small perf tweak in strlen loop
2015-07-01 08:54:33 +02:00
Morris Jobke c703a3a63e Merge pull request #15569 from owncloud/remove-getetag-properties
Remove unneeded getetag entries in properties table
2015-07-01 08:53:37 +02:00
Morris Jobke 044d2ece07 Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util
Move core apps from OC_Log::write to OCP\Util
2015-07-01 08:53:16 +02:00
Morris Jobke f25b71f70e Merge pull request #15475 from rullzer/files_sharing_OCP_DB
Move files sharing app (mostly) to OCP\DB
2015-07-01 08:53:03 +02:00
Vincent Petry b921748e61 Merge pull request #17224 from owncloud/webdav-handle-ServerNotAvailableException
Adding exception handling for ServerNotAvailableException
2015-07-01 07:18:36 +02:00
Vincent Petry f76773bd4c Merge pull request #17259 from owncloud/chunk-cleanupgracefulonlock
Do not try clearing locked files in cache folder
2015-07-01 07:08:47 +02:00
Thomas Müller 02331652d1 Merge pull request #17264 from owncloud/use-mb-functions
Use UTF-8 mode for preg_split and preg_replace
2015-07-01 07:04:22 +02:00
Lukas Reschke aff55347f9 Use UTF-8 mode for preg_split and preg_replace
Otherwise a single application with a description containing a non compliant character can break the whole ownCloud appstore. This is for example https://apps.owncloud.com/content/show.php?content=149553

Fixes https://github.com/owncloud/core/issues/17101#issuecomment-117365224
2015-07-01 01:44:33 +02:00
C Montero-Luque e7a30e091d 8.1 RC2 2015-06-30 19:43:05 -04:00
Thomas Müller 0a23d566ba Merge pull request #17255 from owncloud/fix-17119
[LDAP] Filter user groups obtained by memberof
2015-07-01 00:33:39 +02:00
Vincent Petry 16ff6cff54 Merge pull request #17256 from owncloud/locking-disablecallbackwrapperwhendisabled
Do not set callback wrapper when locking is disabled
2015-06-30 18:28:28 +02:00
Vincent Petry 2fe677d0ed Catch cache garbage collection exception on postLogin
Just log the exception instead of preventing access to OC.
2015-06-30 17:36:55 +02:00
Vincent Petry e339e6f497 Test for chunk cache garbage collection 2015-06-30 17:34:10 +02:00
Vincent Petry dd4de48418 Do not try clearing locked files in cache folder 2015-06-30 17:00:46 +02:00
Björn Schießle 2c1b0f9a66 Merge pull request #17225 from owncloud/fix_12106
if it is a mount point we need to get the path from the mount manager
2015-06-30 16:40:57 +02:00
Bjoern Schiessle 44ec3dd110 if it is a mount point we need to get the path from the mount manager 2015-06-30 15:08:18 +02:00
Thomas Müller 134dc136e6 Avoid namespace clash 2015-06-30 15:07:48 +02:00
Thomas Müller 039a470a6a Fixing content type detection and handle all local printErrorPage calls 2015-06-30 15:05:59 +02:00
Thomas Müller 5dc7eebcdb Adding request specific exception handling - now with WebDAV responses - refs #17192 2015-06-30 15:05:59 +02:00
Thomas Müller 3f3c603922 Adding exception handling for ServerNotAvailableException - refs #17192 2015-06-30 15:05:59 +02:00
Vincent Petry 0118bf04dc Merge pull request #17251 from owncloud/issue-17247-filesize-stat-failed-for-in-log
Perform the filesize on the file that exists
2015-06-30 14:51:29 +02:00