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
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
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
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
afd83caf69
Do not set callback wrapper when locking is disabled
2015-06-30 13:45:41 +02:00
2bcd0af177
Merge pull request #17189 from owncloud/files-straypartfilesonexception
...
Cleanup part file after upload exception
2015-06-30 11:58:26 +02:00
9c533342fc
Perform the filesize only when the file exists
...
Regression from 95602d40699b336765b6
2015-06-30 11:47:58 +02:00
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
fc474de573
Fixing "ImportController::__construct() must implement interface OCP\\ICache, instance of OC\\Cache\\File given"
2015-06-29 22:43:18 +02:00
6506357210
Merge pull request #17239 from owncloud/files-nameconflictfix
...
Fix class name conflict
2015-06-29 21:47:39 +02:00
883888bdc6
Merge pull request #17240 from owncloud/do-not-rely-on-php-being-fast
...
Do not rely on actual time in unit tests
2015-06-29 21:47:15 +02:00
167f57c15e
Unlock first path on rename if second path is locked
2015-06-29 17:31:14 +02:00
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
422d088bb9
Do not rely on actual time in unit tests
...
Ref https://github.com/owncloud/core/pull/17238#issuecomment-116724055
2015-06-29 17:15:42 +02:00
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
b88a0e7080
Merge pull request #17231 from owncloud/add-missing-version-field
...
Add missing version field
2015-06-29 16:41:47 +02:00
30f5fa42e5
Merge pull request #17229 from owncloud/maintenance-plugin-test
...
Unit tests added for MaintenancePlugin
2015-06-29 16:22:38 +02:00
372a9afabe
Fixing ctor calls and ctor itself to not break usage in calendar and contacts .....
2015-06-29 15:54:05 +02:00
ab4d5d20ea
Typehint $targetVersion
2015-06-29 15:10:40 +02:00
1db047a336
Add missing version field
2015-06-29 15:09:57 +02:00
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
f8127046ee
Unit tests added for MaintenancePlugin
2015-06-29 14:18:09 +02:00
70eb20e3a7
Merge pull request #17030 from owncloud/lock-posthooks
...
Keep shared lock for post-hooks
2015-06-29 14:17:03 +02:00
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
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
e236e564af
In case of maintenance we should add a message to the exception
2015-06-29 12:31:01 +02:00
ae3d402dbc
Send OC version to appstore so it can reply with the right links
2015-06-29 12:14:07 +02:00
30145c0b52
Also load enabled apps
2015-06-29 11:38:28 +02:00
aa595392f6
Merge pull request #17217 from owncloud/use-new-updater-url
...
Use new updater URL + add unit tests
2015-06-29 11:27:23 +02:00
b55f71ee03
Merge pull request #17083 from owncloud/share-etag-update-target
...
take share target into account when updating recipient etags
2015-06-29 09:10:37 +02:00
733d59ed44
[tx-robot] updated from transifex
2015-06-29 01:54:44 -04:00
774a38256d
Merge pull request #17219 from owncloud/LukasReschke-patch-1
...
Increase timeout again
2015-06-28 20:19:52 +02:00
a43ba1bf1d
Update comment
2015-06-28 17:06:49 +02:00
7b4e1f526b
Increase timeout again
...
Our test execution is terribly slow and now also exceeds more than one hour on our CI system. This means that Scrutinizer fails hard on a lot of PRs such as https://github.com/owncloud/core/pull/17217#issuecomment-116252420
2015-06-28 17:06:15 +02:00
03498c0b2c
Build base URL
2015-06-28 12:26:47 +02:00
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
4d565a8447
[tx-robot] updated from transifex
2015-06-28 01:55:19 -04:00
717f91a4e8
Merge pull request #17214 from owncloud/fix-php-doc-user-interface
...
Fix PHPDoc + Indentation
2015-06-27 21:58:49 +02:00
dd0625faf3
Merge pull request #17212 from owncloud/ocs-spec
...
Add endpoint with list of OCS providers
2015-06-27 21:56:46 +02:00
a793b98fd0
Fix indentation
2015-06-27 20:37:07 +02:00
af01958f3e
Add missing annotations for parameters
2015-06-27 20:35:47 +02:00
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
76878e9943
Add endpoint with list of OCS providers
...
This adds a OCS provider list at `ocs-provider/` to enable a somewhat autodiscovery of services.
In the moment it is not possible for applications to add own entries and it is basically hard-coded in the controller. I'm aware that this is not an optimal solution and I'm happy for any pragmatic input that won't pollute our public API too much. (and is not a big super hack, this is already hacky enough ;-))
That said, I'd consider it as a first step also feasible to go with this somewhat hard-coded list and see if this gets adopted...
2015-06-27 18:23:49 +02:00
708c6268ad
Merge pull request #17206 from oparoz/bpg-media-type
...
Adding BPG media type
2015-06-27 10:19:56 +02:00
465606c254
Merge pull request #17199 from owncloud/feature/show-error-when-shareservice-dies
...
add check if server returns a 500 and display error
2015-06-27 09:34:34 +02:00
28c223edc6
[tx-robot] updated from transifex
2015-06-27 01:55:58 -04:00
77ae2d6fc4
Merge pull request #17202 from oparoz/repair-scan-signature
...
Signature of overriding method should match the parent
2015-06-27 02:35:40 +02:00
569c2a8deb
Merge pull request #17203 from owncloud/fix-share-autocomplete
...
fix z-index of share-autocomplete
2015-06-26 22:01:42 +02:00
158c5b5e47
Adding BPG media type
2015-06-26 19:22:12 +02:00
ca1da0acb7
add check if server returns a 500 and display error
...
resolves https://github.com/owncloud/core/issues/17170
2015-06-26 12:50:09 -04:00
Vincent Petry
Björn Schießle
Bjoern Schiessle
Morris Jobke
Joas Schilling
Joas Schilling
Thomas Müller
Lukas Reschke
Jenkins for ownCloud
Roeland Douma
Olivier Paroz
Clark Tomlinson