Commit Graph

8739 Commits

Author SHA1 Message Date
Andreas Fischer 68d13210bd Reset mimetype to application/octet-stream on empty reply from file command. 2013-10-29 13:29:35 +01:00
Robin Appelman 0e92a4896d dont use the home storage for non-existing users 2013-10-29 13:12:28 +01:00
Andreas Fischer a04a01d51f Do not calculate $isWrapped if not needed. 2013-10-29 12:54:30 +01:00
Thomas Müller aaefb64306 Merge pull request #5493 from owncloud/fix-language-detection
Fix HTTP language detection
2013-10-28 16:37:12 -07:00
Robin Appelman e273c14540 use the new home storage backend when no existing local storage backend exists for the user's home 2013-10-29 00:26:35 +01:00
Robin Appelman f1e6e80eb1 add specialized storage backend for home folders 2013-10-29 00:14:23 +01:00
Bjoern Schiessle db0fa6c529 use getHome() to delete users data 2013-10-29 18:01:37 +01:00
Jörn Friedrich Dreyer 682d6e8a80 use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace 2013-10-28 14:18:20 +01:00
Vincent Petry e62ca4ea4f Append file etag to preview URLs
Fixes #5534
2013-10-28 14:14:55 +01:00
Morris Jobke 4750fbc226 Merge pull request #5550 from owncloud/fix-4716-master
'Update to' is shown when there is no update
2013-10-28 03:33:27 -07:00
Morris Jobke 78971c61e6 update documentation for app update 2013-10-28 11:27:51 +01:00
Arthur Schiwon 466b6c1ee0 local user backend shall search for both username and displayname, fixes #5401 2013-10-25 21:57:12 +02:00
Vincent Petry ebcd9ae628 Added comment for clarification about fseek() call in quota.php 2013-10-25 16:15:01 +02:00
Bart Visscher b6c67c4c63 'Update to' is shown when there is no update
See #4716
2013-10-25 15:41:59 +02:00
Bart Visscher 310c8400df When updating an appstore app, execute a database update
See #5202
2013-10-25 15:38:08 +02:00
Thomas Müller c455cb989b add header 'OC-FileId' on PUT 2013-10-25 13:20:59 +02:00
Thomas Müller 3bca1519ee switch instance id and file id 2013-10-25 13:20:29 +02:00
Thomas Müller 8253994262 using array_diff_assoc to detect diffs in values as well 2013-10-25 12:40:31 +02:00
Thomas Müller f619f59f1c cast storage_mtime to int 2013-10-25 12:39:50 +02:00
Vincent Petry c8df27de73 Fixed quota stream to not wrap read-only fopen calls 2013-10-25 12:33:16 +02:00
Vincent Petry d8b245490b Fixed quota stream's fseek method
- Added missing return statement
- Added missing support for SEEK_END
- Fixes #5524
2013-10-25 12:09:46 +02:00
Thomas Müller 66813e9df6 Merge branch 'master' into fix-language-detection 2013-10-24 19:27:33 +02:00
Thomas Müller 222f1b8da2 Merge pull request #5494 from owncloud/fixing-3593-master
introducing new dav property {xmlns:oc="http://owncloud.org/ns}id
2013-10-24 09:41:56 -07:00
Thomas Müller c5b8963b18 log the data arrays 2013-10-24 18:13:21 +02:00
Thomas Müller a22f12cfe0 - fixing namespace
- remove property only if present
2013-10-24 14:40:43 +02:00
Thomas Müller 88d1e20d56 some logging added .... 2013-10-24 14:24:56 +02:00
Thomas Müller 808e9b0f51 Merge pull request #5402 from owncloud/fixing-5367-master
fixes chunked upload
2013-10-24 00:56:46 -07:00
Thomas Müller db70b18c1d Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svg
prefer logo png from theme over svg from core
2013-10-23 14:44:43 -07:00
Thomas Müller caa3a8d784 Merge pull request #5464 from owncloud/fixing-5456-master
Fixing 5456 master
2013-10-23 10:50:36 -07:00
Thomas Müller 54e0f1d739 fixing PHPDoc & grammar 2013-10-23 19:06:36 +02:00
Thomas Müller 3d5e229ac5 Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts
Ignore duplicate inserts in file cache and mime type
2013-10-23 07:47:50 -07:00
Jörn Friedrich Dreyer 0bf034da96 prefer logo png from theme over svg from core
The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions.

fixes #5074
partially solves #5421, but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem

@karlitschek @jancborchardt please review
2013-10-23 16:44:56 +02:00
Thomas Müller b02a485712 handle case where fileid is not set 2013-10-23 16:40:29 +02:00
Thomas Müller b60ae11db8 introducing new dav property {xmlns:oc="http://owncloud.org/ns}id 2013-10-23 16:03:57 +02:00
Andreas Fischer 06f2ae082e Have to also strtolower() on available language name. Otherwise no match. 2013-10-23 15:39:50 +02:00
Andreas Fischer daf93c4516 Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching. 2013-10-23 15:38:54 +02:00
Andreas Fischer c14b470ea2 Apply substring on the correct value. 2013-10-23 15:38:22 +02:00
VicDeo 959b0f9125 Merge pull request #5458 from owncloud/fixing-5222-master
php 5.3 compatibility regarding OC\DB\Connection fixed
2013-10-23 05:35:33 -07:00
Vincent Petry a542c57a7b Catch duplicate insertion errors while scanning files
When two scanning processed run at the same time, for example when
scan.php and list.php were called at the same time on an external
storage mountpoint, duplicate insertion errors can occurs.

These errors are now logged and ignored.

Since both scans are running in parallel transactions, they don't see
each other's changes directly in the DB which can cause duplicate
insertion errors for mime types as well, but those mime types can't be
selected yet. The solution to this is to force-reload the mimetypes list
after the transaction is finished.

Fixes #5199
2013-10-23 13:00:46 +02:00
Andreas Fischer 4c76dd3871 Better variable names. 2013-10-23 12:56:51 +02:00
Andreas Fischer 207f6d55ce Fix coding style for else. 2013-10-23 12:39:12 +02:00
Thomas Müller 3c710696e8 add missing file header 2013-10-23 12:27:54 +02:00
Andreas Fischer 9d1b425b62 Correct indentation for default language. 2013-10-23 12:25:48 +02:00
Björn Schießle 2d14daf36b Merge pull request #5472 from owncloud/enc_init_status_on_enable
Encryption set init status on enable
2013-10-23 01:02:45 -07:00
Thomas Müller 4bf37f72b2 Merge pull request #5482 from owncloud/fix_weird_http_namespace
Fix namespace for OCP\Appframework\Http
2013-10-23 00:40:30 -07:00
Thomas Müller cf61b1a977 Merge pull request #5391 from owncloud/undefined-property-in-schema-master
removing pointless calls on quoteIdentifier() - reason: name on $tableDi...
2013-10-22 22:46:43 -07:00
Thomas Tanghus ad017285e1 Fix namespace for OCP\Appframework\Http
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
2013-10-23 05:57:34 +02:00
Thomas Müller 064fd5ae53 Merge pull request #5451 from owncloud/reuse-session-ocs-master
Support existing sessions within OCS API calls
2013-10-22 14:41:21 -07:00
Thomas Müller 09903aa36c - delete properties on node delete
- move properties on node move
2013-10-22 19:41:26 +02:00
Bjoern Schiessle bd450d6f6b add post_enable hook if a app gets enabled 2013-10-22 16:15:19 +02:00
Thomas Müller 6e0e621218 creating and deleting of file and folder 'Shared' in root is not allowed 2013-10-22 11:10:07 +02:00
Thomas Müller cadd71ec8a Merge pull request #5455 from owncloud/fixing-2423-master
introduce link_to_docs() and migrate links
2013-10-22 01:28:43 -07:00
Thomas Müller 9d976013da Merge pull request #5437 from owncloud/create-custom-logfile
Try to create custom log file before falling back to default.
2013-10-22 01:17:31 -07:00
Thomas Müller 7f1432600c fixing php 5.3.3 error:
Undefined variable: this
lib/private/appframework/dependencyinjection/dicontainer.php:92
2013-10-22 09:29:17 +02:00
Thomas Müller 87a09156f8 use OC_Helper::linkToDocs() in lib/private/config.php 2013-10-21 23:08:09 +02:00
Thomas Müller e30e4ea1cc php 5.3 compatibility regarding OC\DB\Connection fixed 2013-10-21 22:51:56 +02:00
Thomas Müller 408e0022dd Merge pull request #5249 from owncloud/activities-api
[OC6] Activities api
2013-10-21 13:21:17 -07:00
Thomas Müller 124984905e introduce OC_Helper::linkToDocs() 2013-10-21 22:01:27 +02:00
Victor Dubiniuk 97aff7c64e Use quoteIdentifier with proper objects 2013-10-21 22:31:57 +03:00
Thomas Müller 148d2616e5 introduce link_to_docs() and migrate links 2013-10-21 21:29:45 +02:00
Thomas Müller 66a2f3b0b9 New OCS route:
/ocs/cloud/user
Response:
 <?xml version="1.0"?>
 <ocs>
  <meta>
   <status>ok</status>
   <statuscode>100</statuscode>
   <message/>
  </meta>
  <data>
   <id>thomas</id>
   <display-name>DeepDiver</display-name>
   <email>no-response@domain.tld</email>
  </data>
 </ocs>
2013-10-21 20:14:18 +02:00
Thomas Müller 581cd9bb9c Support existing sessions within OCS API calls 2013-10-21 18:58:46 +02:00
Thomas Müller 2628601e79 adding oc-mtime handling to chunked upload 2013-10-21 15:00:28 +02:00
Thomas Müller 3cb666ad77 chunked files are assembled into a part file on the target storage followed by an atomic rename operation. 2013-10-21 13:21:39 +02:00
Andreas Fischer 5978ddbec6 Try to create custom log file before falling back to default. 2013-10-20 23:58:07 +02:00
Arthur Schiwon 701009bd72 dispayNamesInGroup(s) should always return uid as key in the result attr, fixes #5209 2013-10-20 20:55:27 +02:00
Frank Karlitschek 9e99f9d13d the logfile shoudn't be world readable. 2013-10-18 17:15:02 +02:00
Morris Jobke 1f1fcc6129 Remove "link" shares right after disabling the "allow_link_share" setting 2013-10-18 11:37:13 +02:00
Vincent Petry 5c5621d84e Merge pull request #5395 from owncloud/more_check_options
add options to disable the check for a working .htaccess file in data
2013-10-18 01:23:20 -07:00
Vincent Petry 11cfb9dc48 Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout
Added timeout for WebDAV post setup check
2013-10-18 01:10:04 -07:00
Vincent Petry b1f72edc57 Fixed spaces 2013-10-17 23:22:19 +02:00
Thomas Müller d2d2c9a46d fixes #5367 2013-10-17 20:20:13 +02:00
Frank Karlitschek 6a60a47d59 add options to disable the check for a working .htaccess file in data and for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout. 2013-10-17 16:27:43 +02:00
Thomas Müller c3c27b3e58 Merge pull request #5394 from owncloud/sabre-server-location
Move OC_Connector_Sabre_Server to expected location.
2013-10-17 07:11:50 -07:00
Andreas Fischer 5ee74b656c Move OC_Connector_Sabre_Server to expected location. 2013-10-17 16:04:59 +02:00
Georg Ehrke 4c5959e1f5 fix comment 2013-10-17 15:19:15 +02:00
Thomas Müller e55d2359b1 removing pointless calls on quoteIdentifier() - reason: name on $tableDiff doesn't exist and my design the name cannot be changed
adding PHPDoc
2013-10-17 14:54:37 +02:00
Georg Ehrke 521277b8b6 only call shell_exec if enabled 2013-10-17 14:31:07 +02:00
Morris Jobke 9c8d1190c0 Merge pull request #5385 from owncloud/generate-sql-migration-master
new console command to generate sql migration scripts
2013-10-17 04:53:18 -07:00
Frank Karlitschek d2b1a361cc Merge pull request #5379 from owncloud/undefined-shipped
fix undefined "shipped"
2013-10-17 04:37:40 -07:00
Thomas Müller 6e1881dbe4 new console command to generate sql migration scripts 2013-10-17 12:51:30 +02:00
Morris Jobke 793ccfd1df fix undefined "shipped" 2013-10-17 11:35:13 +02:00
Thomas Müller b70d67d49a Merge pull request #5237 from owncloud/coverage-on-windows-master
PHP Code Coverage on windows master
2013-10-17 02:23:15 -07:00
Frank Karlitschek 186c6a56d1 Merge pull request #4949 from owncloud/improve_unknown_preview_backend
use svg to generate filetype icon if imagick available
2013-10-17 01:48:34 -07:00
Morris Jobke 04783da829 Merge pull request #5276 from owncloud/fixing-5170-master
only text/plain is now used to generate text previews
2013-10-16 14:21:40 -07:00
Thomas Müller 221a650815 Merge branch 'master' into activities-api
Conflicts:
	lib/private/server.php
2013-10-16 21:15:25 +02:00
Thomas Müller fdeef5e874 Merge branch 'master' into fixing-appframework-master
Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
2013-10-16 15:45:55 +02:00
Thomas Müller c3f7d22adc Merge pull request #5067 from owncloud/urlParams_fix
Get urlParams registered before Request is instantiated
2013-10-16 06:42:09 -07:00
Thomas Müller 8c2b0b1394 Merge branch 'master' into activities-api 2013-10-16 15:36:35 +02:00
Thomas Müller aca66270c7 accept text/markdown as well 2013-10-16 15:31:43 +02:00
Thomas Müller d8a7b1e537 Merge branch 'master' into fixing-5170-master 2013-10-16 14:48:55 +02:00
Thomas Müller fa3a65aea7 Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend
file system is now initialized with apache authentication as well
2013-10-16 04:23:45 -07:00
Vincent Petry 52e31405f7 Added timeout value to WebDAV post setup check
Fixes #5357
2013-10-16 12:34:22 +02:00
Vincent Petry 7037f9c6f8 Added DAV client wrapper that support timeout values
Since SabreDAV does not support passing a timeout value to curl, this
commit adds a subclass for it that will set the timeout value to
curlRequest().
2013-10-16 12:32:42 +02:00
Björn Schießle ada94fb558 Merge pull request #5333 from owncloud/avater_with_encryption
avatars should also work with encryption after pr #5332 was merged
2013-10-16 01:34:05 -07:00
Vincent Petry 5f249e1a54 Prevent renaming/deleting mount points
Fixed permissions returned for mount points to not include update and
delete permissions.

Fixes #5291
2013-10-15 14:58:58 +02:00
Bjoern Schiessle 25320f19df Merge branch 'master' into avater_with_encryption 2013-10-15 11:53:51 +02:00
Vincent Petry fa341e49a8 Merge pull request #5341 from owncloud/fix-logout-link-html
Fix logout link HTML.
2013-10-15 00:33:00 -07:00
Thomas Müller e3489b36ff any preview requiring the which command will not be used on Windows 2013-10-15 00:15:45 +02:00
Andreas Fischer 06f9b7b862 Fix logout link HTML.
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
2013-10-14 22:31:13 +02:00
Thomas Müller 6df5c7ebd5 streamCopy() should return proper structure.
Callers of streamCopy() expect an array to be returned containing count and result.
2013-10-14 21:33:23 +02:00
Bjoern Schiessle 3380bd650f avatars should also work with encryption after pr #5332 was merged 2013-10-14 17:30:24 +02:00
Thomas Müller c97b52090e Merge pull request #4867 from owncloud/fixing-4546-master
Adding detection of aborted uploads for chunked uploads
2013-10-14 06:39:32 -07:00
Thomas Müller 5318df3b3c there shall be tabs 2013-10-14 14:51:25 +02:00
Thomas Müller fb3829e8b8 file system is now initialized with apache authentication as well 2013-10-14 14:46:43 +02:00
Georg Ehrke 71601a7c6f implement previews for markdown 2013-10-14 14:10:47 +02:00
Frank Karlitschek 258ccdfabe case insensitive sort 2013-10-14 11:15:04 +02:00
Frank Karlitschek a201a66878 fix style 2013-10-14 10:57:00 +02:00
Thomas Müller a5e808defc Merge branch 'master' into fixing-4546-master
Conflicts:
	lib/private/connector/sabre/file.php
2013-10-14 10:56:50 +02:00
Frank Karlitschek f06df170cb finally fix the app sorting 2013-10-14 10:54:38 +02:00
Tom Needham 14617682c8 Merge branch 'master' of github.com:owncloud/core into fix-unlogged-session-error 2013-10-12 09:15:59 +01:00
Thomas Müller dc58195c7f Merge pull request #5207 from owncloud/fixing-4011-part2-master
[OC6] file upload exception handling
2013-10-11 10:35:17 -07:00
Tom Needham cf7ea4bec5 Handle ownCloud logging when data dir not created 2013-10-11 17:16:37 +01:00
Georg Ehrke e28f7f8a33 remove php and js previews 2013-10-11 11:43:26 +02:00
Thomas Tanghus d75d80ba13 OCP\AppFramework\Controller\Controller => OCP\AppFramework\Controller 2013-10-11 10:07:57 +02:00
Thomas Müller 51e6565aab only text/plain is now used to generate text previews
blacklist implementation remove because no longer needed
2013-10-11 00:25:34 +02:00
Thomas Müller 19ea4f79da resize svg without loosing quality 2013-10-11 00:12:37 +02:00
VicDeo 26c0007a5f Merge pull request #5263 from owncloud/fixing-5255-master
Proper behavior of resolvePath()
2013-10-10 09:27:45 -07:00
Thomas Müller bc6e352ccd the path need to be normalized before putting it into resolvePath()
otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
2013-10-10 16:06:26 +02:00
Robin Appelman 1378af838c merge master into hooks-view-same-start 2013-10-10 11:34:30 +02:00
VicDeo 1cb47bf777 Merge pull request #5221 from owncloud/fixing-5217-master
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
Björn Schießle 6053007768 Merge pull request #5210 from owncloud/sharing_search_users_fix
find users which are in the same group
2013-10-10 01:50:51 -07:00
Frank Karlitschek 1a899ac4c3 Merge pull request #5232 from owncloud/fixing-webdav-touch-master
due to internal implementations touch will always be successful - $mtime...
2013-10-10 01:49:59 -07:00
Robin Appelman 7f8eeb0474 ensure the view's root is a subfolder of the the default root, not only starting the same 2013-10-09 20:46:43 +02:00
Robin Appelman 38c563dcdc don't trigger the create hooks when if the file already exists for file_put_contents 2013-10-09 20:34:18 +02:00
Thomas Müller 8e97752bf7 adding OC6 public API for activities 2013-10-09 18:06:21 +02:00
Thomas Müller 926b3c9b7b Merge branch 'master' into activities-api 2013-10-09 17:53:57 +02:00
Thomas Müller 27738fc4f5 due to internal implementations touch will always be successful - $mtime will be stored in the cache
from desktop client perspective it is necessary to set the mtime under every condition
2013-10-09 15:35:09 +02:00
Björn Schießle b4df4cc61d Merge pull request #5219 from owncloud/catch_wrong_timezone
catch unknown timezone and fall-back to UTC
2013-10-09 01:59:09 -07:00
Bjoern Schiessle c1e5725db9 changed default time format to ISO8601 2013-10-09 10:40:20 +02:00
Andreas Fischer fe64f7b900 Merge pull request #5032 from owncloud/fixing-5006-master
Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.

* owncloud/fixing-5006-master:
  Use strict comparison === instead of ==.
  Adjust return value tests for checkPassword() to what OC_User_Example says.
  Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
  Use parent:: in Test_User_Database::getUser().
  Test_User_Backend::getUser() does not return an array, it returns a string.
  Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
2013-10-08 23:17:51 +02:00
Thomas Müller 7bd5352509 php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainer 2013-10-08 23:14:08 +02:00
Thomas Müller 51b581a84d php 5.3 compatibility for \OC\Files\Storage 2013-10-08 23:00:41 +02:00
Thomas Müller 24e99016a9 Merge pull request #5188 from owncloud/master-delete-user
User::delete should return bool
2013-10-08 13:28:19 -07:00
Thomas Müller 6f3c49dabb fixing php 5.3 compatibility
PHP Fatal error: Can't inherit abstract function OCP\ISession::set() (previously declared abstract in OC\Session\Session)
2013-10-08 21:52:54 +02:00
Bjoern Schiessle 3cf4c46c43 catch unknown timezone and fall-back to UTC 2013-10-08 20:42:35 +02:00
Andreas Fischer 75588fc0b6 Use strict comparison === instead of ==. 2013-10-08 20:03:16 +02:00
Andreas Fischer 6eab36a89b Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.
The user id has to be returned.
2013-10-08 19:57:37 +02:00
Björn Schießle 76bdd6bc81 Merge pull request #5173 from owncloud/set_timezone_for_log
let admin specify timezone for log file entries
2013-10-08 09:27:13 -07:00
Bjoern Schiessle 835f36cb09 find users which are in the same group 2013-10-08 16:43:23 +02:00
Frank Karlitschek 92d9263e24 Merge pull request #5146 from guruz/cache_enabled_apps_list
OC_App: Cache list of enabled apps
2013-10-08 07:17:36 -07:00
Thomas Müller 3f27fefdbe fixing status code and formatting 2013-10-08 15:40:42 +02:00
Thomas Müller e7e53363ac Merge pull request #5194 from owncloud/fixing-5172-master
adding check isDeletable() on $sourcePath
2013-10-08 06:18:29 -07:00
Thomas Müller caa27824a9 catch specific file exceptions and convert them to proper http status code via webdav 2013-10-08 15:04:31 +02:00
Thomas Müller 053b55721d Merge branch 'master' into fixing-appframework-master 2013-10-08 12:13:24 +02:00
Bjoern Schiessle 6c45fab037 part file needs to have .part extension 2013-10-08 12:00:32 +02:00
Thomas Müller c77f74e1de adding check isDeletable() on $sourcePath 2013-10-08 11:43:44 +02:00
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
Victor Dubiniuk 77f43c357c User::delete should return bool 2013-10-07 22:30:15 +03: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
Thomas Müller 61a534fb60 moving createFileChunked() to OC_Connector_Sabre_File 2013-10-07 17:49:21 +02:00
Thomas Müller 5e397d89c4 Merge branch 'master' into fixing-4546-master
Conflicts:
	lib/private/connector/sabre/directory.php
2013-10-07 17:47:54 +02:00
Thomas Müller f496609085 the path for reassembling was created the wrong way 2013-10-07 17:34:21 +02:00
Bjoern Schiessle 6a411833b9 let admin specify timezone for log file entries 2013-10-07 15:34:48 +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
Thomas Müller 730c80ff9c adding additional exceptions for special cases where creating a file might not be allowed 2013-10-07 15:11:47 +02: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
Morris Jobke be4aea2d1b fix indentation 2013-10-07 13:21:20 +02:00
Georg Ehrke e078fc3eda fix wrong variable name 2013-10-07 13:19:21 +02:00
Georg Ehrke 3b5dc51be4 fix doc block of OC\Preview\Provider::getThumbnail() 2013-10-07 13:19:21 +02:00
Georg Ehrke 8a35d79a39 check if svg of filetype icon exists 2013-10-07 13:19:21 +02:00
Georg Ehrke f81053072f use readImage instead of readImageBlob 2013-10-07 13:19:21 +02:00
Georg Ehrke d410faf11c fix new extension 2013-10-07 13:19:21 +02:00
Georg Ehrke 4ac3ecace2 use svg to generate filetype icon if imagick available 2013-10-07 13:19:20 +02: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 c3286402a8 removing log(), getTemplate(), getLocalFilePath(), getUrlContent(), getFileInfo() 2013-10-07 11:41:28 +02:00
Thomas Müller 39be4dca67 removing all link/url related calls from API class 2013-10-07 11:38:23 +02:00
Thomas Müller 3ea2dfa5f9 remove getTrans() from API class 2013-10-07 11:36:38 +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
Thomas Müller 54e77e0e66 fixing typo 2013-10-07 00:40:37 +02:00
Thomas Müller 780280e53f fixing errors regarding wrong function calls / missing parameters 2013-10-07 00:35:05 +02:00
Thomas Müller f3c6546d5b remove obsolete passesCSRFCheck() 2013-10-07 00:34:23 +02:00
Thomas Müller e071bfc144 fixing SecurityMiddleware to use OC6 API 2013-10-07 00:33:54 +02:00
Thomas Müller 3829a746a1 moving file to the right location 2013-10-07 00:32:39 +02: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
Thomas Müller 1f14ba6aed move controller to OCP 2013-10-06 23:16:40 +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
Markus Goetz e564a3a266 OC_App: Cache list of enabled apps
In my test here 1 SELECT instead of 5 (when doing a DAV request,
probably similar for other requests)
2013-10-05 19:18:18 +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
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
Thomas Müller 9c23c3449b Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	core/css/share.css
2013-10-02 23:33:50 +02:00
Thomas Tanghus 965ce5719f Modified PUT behaviour
Now only non-parable PUT requests return a stream resource.
2013-10-02 22:13:40 +02:00
Bart Visscher a90ea2c069 Merge remote-tracking branch 'origin/master' into setup 2013-10-02 18:23:59 +02:00
Vincent Petry ed14541aea Removed stray debug log write 2013-10-02 16:44:38 +02:00
Vincent Petry 31e1c15db7 Added dateOnly argument to relative_modified_date
Improved the template function relative_modified_date by adding an
optional dateOnly argument which will output "today" or "yesterday" or
"x days ago".
2013-10-02 15:52:44 +02:00
Andreas Fischer aa34438d06 Also replace ApacheBackend with Authentication\IApacheBackend in user. 2013-10-02 15:11:49 +02:00
Thomas Müller 621ab1c7ee fixing various PHPDoc comments 2013-10-02 15:04:42 +02:00
Thomas Müller 78c60c25c8 only perform files upgrade in case there are actually entries in the old fscache table 2013-10-02 13:00:05 +02:00
Bjoern Schiessle 8b08b1b455 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/private/util.php
2013-10-02 10:11:18 +02:00
Bart Visscher b35b22977c Move legacy file to correct location 2013-10-02 09:15:31 +02:00
Bart Visscher 46b5202f4a Merge branch 'master' into convert-oc_appconfig 2013-10-02 07:42:06 +02:00
Thomas Müller 4cecede13d code cleanup - remove special case for webdav in handleApacheAuth() 2013-10-02 00:55:35 +02:00
Thomas Müller 7e9e23f210 Merge branch 'master' into apache-auth-master 2013-10-02 00:21:11 +02:00
Thomas Müller 9eab8b39df Merge branch 'master' into fixing-4620-master 2013-10-01 22:57:46 +02:00
Thomas Tanghus 0f13ffb773 Remove JSON request parsing from Server 2013-10-01 20:15:04 +02:00
Thomas Tanghus 973bcccd7c Implement PUT an PATCH support 2013-10-01 20:13:13 +02:00
Thomas Tanghus cd2e1d0cfe Add patch method to OC_Route 2013-10-01 20:13:13 +02:00
Thomas Tanghus bdad7697ac Check if accessor matched request method.
It's easier to find errors in the code if an exception is thrown.
2013-10-01 20:13:13 +02:00
Thomas Tanghus 8603f956ab Get urlParams registered before Request is instantiated 2013-10-01 19:03:34 +02:00
Thomas Müller e2fe71b6e7 Merge branch 'master' into lib-private-master-2 2013-10-01 16:11:59 +02:00
Thomas Müller 02d6976263 Merge branch 'master' into lib-private-master-2 2013-09-30 21:29:58 +02:00
Thomas Müller 8e0060405d reorganize file in lib 2013-09-30 16:39:03 +02:00
Thomas Müller 9c9dc276b7 move the private namespace OC into lib/private - OCP will stay in lib/public
Conflicts:
	lib/private/vcategories.php
2013-09-30 16:36:59 +02:00