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
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
fd4efdded9
Clean up part file only once, not twice on error
2015-07-01 09:47:05 +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
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
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
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
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
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
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
Vincent Petry
afd83caf69
Do not set callback wrapper when locking is disabled
2015-06-30 13:45:41 +02:00
Morris Jobke
2bcd0af177
Merge pull request #17189 from owncloud/files-straypartfilesonexception
...
Cleanup part file after upload exception
2015-06-30 11:58:26 +02:00
Joas Schilling
9c533342fc
Perform the filesize only when the file exists
...
Regression from 95602d4069
and 9b336765b6
2015-06-30 11:47:58 +02:00
Joas Schilling
a1bfc26b88
Merge pull request #17249 from owncloud/file-cache-is-a-icache
...
Fixing "ImportController::__construct() must implement interface OCP\…
2015-06-30 09:46:09 +02:00
Thomas Müller
fc474de573
Fixing "ImportController::__construct() must implement interface OCP\\ICache, instance of OC\\Cache\\File given"
2015-06-29 22:43:18 +02:00
Vincent Petry
167f57c15e
Unlock first path on rename if second path is locked
2015-06-29 17:31:14 +02:00
Vincent Petry
3217d4dad1
Cleanup part file after upload exception
...
Added unit tests for checking for stray part files.
Convert exception to sabre exception in upload put method.
Also added unit test for exception mapping, which also indirectly tests
that the part file is being deleted on exception.
This applies to both chunking and non-chunking mode.
Added some unit tests for chunk upload.
2015-06-29 17:31:14 +02:00
Vincent Petry
2fa432dfb8
Fix class name conflict
...
Looks like PHP 5.6.x doesn't like name conflicts.
\Sabre\DAV\Server would overlap with \OC\Connector\Sabre\Server.
2015-06-29 17:11:14 +02:00
Morris Jobke
b88a0e7080
Merge pull request #17231 from owncloud/add-missing-version-field
...
Add missing version field
2015-06-29 16:41:47 +02:00
Joas Schilling
30f5fa42e5
Merge pull request #17229 from owncloud/maintenance-plugin-test
...
Unit tests added for MaintenancePlugin
2015-06-29 16:22:38 +02:00
Thomas Müller
372a9afabe
Fixing ctor calls and ctor itself to not break usage in calendar and contacts .....
2015-06-29 15:54:05 +02:00
Lukas Reschke
ab4d5d20ea
Typehint $targetVersion
2015-06-29 15:10:40 +02:00
Lukas Reschke
b56af26199
Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store
...
Send OC version to appstore so it can reply with the right links
2015-06-29 15:07:00 +02:00
Thomas Müller
f8127046ee
Unit tests added for MaintenancePlugin
2015-06-29 14:18:09 +02:00
Joas Schilling
70eb20e3a7
Merge pull request #17030 from owncloud/lock-posthooks
...
Keep shared lock for post-hooks
2015-06-29 14:17:03 +02:00
Morris Jobke
c57fb19b2f
Merge pull request #17226 from owncloud/webdav-add-message-on-maintenance
...
In case of maintenance we should add a message to the exception
2015-06-29 14:11:36 +02:00
Lukas Reschke
5810e7ab87
Merge pull request #17050 from owncloud/request-status-from-ocs
...
Request approved state for disabled apps with ocsid
2015-06-29 13:41:11 +02:00
Thomas Müller
e236e564af
In case of maintenance we should add a message to the exception
2015-06-29 12:31:01 +02:00
Joas Schilling
ae3d402dbc
Send OC version to appstore so it can reply with the right links
2015-06-29 12:14:07 +02:00
Lukas Reschke
04fe9e05f0
Use new updater URL + add unit tests
...
Uses the new updater url "https://updates.owncloud.com/server/ "
2015-06-28 11:25:28 +02:00
Lukas Reschke
a793b98fd0
Fix indentation
2015-06-27 20:37:07 +02:00
Lukas Reschke
af01958f3e
Add missing annotations for parameters
2015-06-27 20:35:47 +02:00
Lukas Reschke
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
Roeland Douma
708c6268ad
Merge pull request #17206 from oparoz/bpg-media-type
...
Adding BPG media type
2015-06-27 10:19:56 +02:00
Olivier Paroz
158c5b5e47
Adding BPG media type
2015-06-26 19:22:12 +02:00
Vincent Petry
0684cc15dc
Merge pull request #17071 from owncloud/share-get-users-non-existing
...
fix getUsersSharingFile with locking
2015-06-26 18:27:53 +02:00
Vincent Petry
271ef9dedb
Remove test-specific method to make Bjoern and Joas happy
2015-06-26 17:37:04 +02:00
Robin Appelman
c338999032
fix getUsersSharingFile with locking
2015-06-26 16:31:52 +02:00
Thomas Müller
ac94126393
Merge pull request #17191 from owncloud/issue-17188-group-share-part-file
...
Correctly check if the real file exists, otherwise try the part file
2015-06-26 16:01:41 +02:00
Björn Schießle
b318b9cf17
Merge pull request #17008 from owncloud/fix-17006
...
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
Joas Schilling
9b336765b6
Correctly check if the real file exists, otherwise try the part file
2015-06-26 13:17:23 +02:00