Commit Graph

4874 Commits

Author SHA1 Message Date
Bjoern Schiessle dd202d9ad3 updating a existing large file creates new file chunks. Therefore createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file" 2013-10-08 11:27:08 +02:00
Bjoern Schiessle 0293d8e04f If a existing file in Shared/ with update permissions gets updated we need to write the .part file to a different place because we can't create new files in the Shared folder 2013-10-08 11:26:49 +02:00
Morris Jobke 2123ef57d8 Merge pull request #5181 from owncloud/fixing-chunked-upload-master
Fixing broken chunked upload due to #4974
2013-10-07 13:20:43 -07:00
Bart Visscher 6a93994a01 Merge pull request #4796 from owncloud/config-no-catch
Remove the exception catch in OC_Config, this should be handled by a higher layer
2013-10-07 11:45:13 -07:00
Jenkins for ownCloud c655eec3d1 [tx-robot] updated from transifex 2013-10-07 12:21:38 -04:00
Thomas Müller f496609085 the path for reassembling was created the wrong way 2013-10-07 17:34:21 +02:00
Thomas Müller b48dffa9a3 Merge pull request #5072 from owncloud/apache-auth-master
OC6 Apache Authentication
2013-10-07 06:29:56 -07:00
Morris Jobke 2b3c351601 Merge pull request #5162 from owncloud/fixing-l10n-master-2
Fixing l10n master 2
2013-10-07 05:07:47 -07:00
Frank Karlitschek 30faaf92b9 Merge pull request #5142 from owncloud/fix_version_cache_expire
correctly expire cache if version file changed.
2013-10-07 03:48:29 -07:00
Frank Karlitschek 3f29e4ebea a few styleguide fixes 2013-10-07 12:27:02 +02:00
Andreas Fischer 47ed6a5135 Move backend finding into its own method. 2013-10-07 12:26:25 +02:00
Thomas Müller 1e47468c53 Merge pull request #4974 from owncloud/fixing-4011-master
error handling added in case file_put_contents is failing
2013-10-07 02:58:00 -07:00
Thomas Müller 131d82e41e move call to print_unescaped() to template 2013-10-07 11:49:43 +02:00
Thomas Müller 4e0c4c8f34 move l10n factory into private 2013-10-07 10:00:23 +02:00
Thomas Müller dbdf34402c remove outdated translation files 2013-10-07 09:59:15 +02:00
Morris Jobke d986495297 Merge pull request #5148 from owncloud/cache-gc-legacy
Fix loading legacy global filecache gc backgroundjobs
2013-10-06 16:25:38 -07:00
Jenkins for ownCloud 3613e79e10 [tx-robot] updated from transifex 2013-10-06 19:16:10 -04:00
Bart Visscher 8115c38670 Remove the exception catch, this should be handled by a higher layer
And is when using index.php as entry point
2013-10-07 00:09:25 +02:00
Bernhard Posselt 381b76ebd0 Merge pull request #5144 from owncloud/public_middleware
Make abstract Middleware class public
2013-10-06 14:12:35 -07:00
Robin Appelman 98ef90ad04 Fix loading legacy global filecache gc backgroundjobs 2013-10-05 23:19:12 +02:00
Thomas Tanghus 47b2007228 Remove misleading IMiddleware interface 2013-10-05 19:13:12 +02:00
Thomas Tanghus 0501a947bc Merge pull request #5116 from owncloud/interfaces2
More Interfaces for the public api
2013-10-05 08:35:50 -07:00
Thomas Tanghus c85621a897 Make abstract Middleware class public
It doesn't make sense for subclasses to have to implement
all methods.
2013-10-05 16:59:06 +02:00
Frank Karlitschek 72b30e3e45 correctly expire cache if version file changed. Fixes problem that ownCloud only starts upgrading during login 2013-10-05 12:50:36 +02:00
Frank Karlitschek a82211220c Merge pull request #5125 from owncloud/fixing-5122-master
upload abortion detection only for PUT
2013-10-05 02:25:45 -07:00
Frank Karlitschek 4bce2f8b85 Merge pull request #5123 from owncloud/cache_mimetypes
Load all mimetypes in one go
2013-10-05 02:24:38 -07:00
Victor Dubiniuk 8da1aac1d0 Check result only once 2013-10-04 23:24:38 +03:00
Thomas Müller 414b2eb4b6 upload abortion detection only for PUT
e.g. LOCK would break with this approach
2013-10-04 20:20:33 +02:00
Bart Visscher 21cbef0d2c passesCSRFCheck added to OCP\IRequest 2013-10-04 18:13:04 +02:00
Bart Visscher 61a9098b7d Add Helper and URLGenerator interfaces to server container 2013-10-04 18:11:02 +02:00
Bart Visscher ce9436c051 OC_Defaults is only used in error reporting 2013-10-04 18:11:02 +02:00
Bart Visscher 9f777fba98 Add L10N interface to server container 2013-10-04 18:11:02 +02:00
Bart Visscher bae121b16d Merge pull request #5068 from owncloud/improved_request
Improved request
2013-10-04 09:05:20 -07:00
Victor Dubiniuk ef65037211 Make mimetypes static. Jenkis will be happy 2013-10-04 18:09:42 +03:00
Victor Dubiniuk 65750cb244 Load all mimetypes in one go 2013-10-04 16:17:19 +03:00
Vincent Petry 48a4c67d48 Merge pull request #5087 from owncloud/templatefunction-relativedate
Added dateOnly argument to relative_modified_date
2013-10-04 05:53:13 -07:00
Vincent Petry f3594904c2 Removed $fromTime argument from public template API 2013-10-04 14:45:12 +02:00
Thomas Müller aebc330f26 Merge branch 'master' into fixing-4011-master 2013-10-04 14:06:42 +02:00
Markus Goetz 800bf0769f Merge pull request #5091 from guruz/webdav_connector_use_cache_for_etag
DAV: Use fileinfo_cache for ETag
2013-10-04 04:27:28 -07:00
Bjoern Schiessle 51295e9a6b Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
Frank Karlitschek 47666796a7 ups. remove debug 2013-10-04 09:42:38 +02:00
Frank Karlitschek e49ee47e7b use Filesystem::isIgnoredDir 2013-10-04 09:28:46 +02:00
Frank Karlitschek f0a98cc923 fix typo 2013-10-04 09:25:54 +02:00
Frank Karlitschek 6d95436695 add public static 2013-10-04 09:24:07 +02:00
Frank Karlitschek e40afbebc6 make it possible to prepopulate a new user gome with a skeleton 2013-10-03 23:22:11 +02:00
Markus Goetz 7f7718888d DAV: Use fileinfo_cache for ETag 2013-10-03 17:09:08 +02:00
Vincent Petry 006799616d Fixed missing default values
Added default value for $fromTime to prevent missing argument errors and
keep backward compatible.
2013-10-03 14:21:41 +02:00
Vincent Petry b0bb64c3ee Added unit tests for relative_modified_date, changed method signature
Changed method signature of relative_modified_date template method to
make it possible to add a fromTime to compare with, mostly to make it
possible to test it.

Added unit test for date and time cases.
2013-10-03 13:55:05 +02:00
Thomas Tanghus aedc427ffd Fix fix of POST :P 2013-10-03 03:56:37 +02:00
Thomas Tanghus 8a018d7a59 Fix POST decoding 2013-10-03 01:43:33 +02:00