Commit Graph

4995 Commits

Author SHA1 Message Date
Jenkins for ownCloud 44a5b0bad0 [tx-robot] updated from transifex 2013-10-10 22:30:58 -04: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
Morris Jobke 0641365a10 Merge pull request #4780 from AxelRb/master
On an auth failure the uid and the IP address should be logged to the st...
2013-10-10 07:21:36 -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
Axel Roenn 9b0454380c changed the argument to false for getValue , reformated else statement 2013-10-10 14:15:13 +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
Bjoern Schiessle 7fe493fdb8 make sure that we only find file/folder shares 2013-10-09 17:25:58 +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
Björn Schießle f49de34373 Merge pull request #5193 from owncloud/fix_5126_2
fix upload to /Shared
2013-10-08 06:15:43 -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
Jenkins for ownCloud 209392587f [tx-robot] updated from transifex 2013-10-08 07:24:19 -04: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
Jenkins for ownCloud c655eec3d1 [tx-robot] updated from transifex 2013-10-07 12:21:38 -04: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 aefea2a408 remove unused classes 2013-10-07 11:25:06 +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
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
Thomas Müller fda37ea09c PHPDoc added 2013-10-07 00:32:08 +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
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