mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
13,722 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

4668 Commits

Author SHA1 Message Date
Thomas Müller e3dee63339 Merge branch 'master' into fixing-4011-master 
Conflicts:
	lib/connector/sabre/directory.php
	lib/connector/sabre/file.php
 2013-09-30 10:46:50 +02:00
Thomas Müller 5899485ca1 Merge pull request #4969 from owncloud/fixing-4043-master 
adding privilege check on move and rename operations
 2013-09-30 00:20:34 -07:00
Evgeni Golov b6fc143074 cURL does not honour default_socket_timeout 
SabreDAV uses cURL for the requests and as this does not honour
default_socket_timeout, setting it is useless and confusing as
people will expect the request to timeout faster than it actually
will do.

One has to use
 curl_setopt($curl, CURLOPT_TIMEOUT, x)
or
 curl_setopt($curl, CURLOPT_CONNECTTIMEOUT, x)
but there is currently no way to make SabreDAV pass this to cURL.
 2013-09-30 07:56:54 +02:00
Andreas Fischer 9ba0edcadb Merge pull request #4966 from owncloud/text_preview_blacklist 
add blacklist to txt preview backend

* owncloud/text_preview_blacklist:
  rename variable in testIsTransparent
  rename testTxtBlacklist to txtBlacklist
  move fileView object initialization to testIsTransparent
  use dataProvider for txt blacklist test
  add test for txt blacklist
  add test data for cal and contact preview
  add blacklist to txt preview backend
 2013-09-29 23:20:34 +02:00
Thomas Müller a79294771b Merge pull request #4960 from owncloud/fixing-mirall-1014-master 
handle error situation of rename proper
 2013-09-29 12:49:10 -07:00
Thomas Müller 735608f513 Merge pull request #4207 from owncloud/search_shared_files 
add initial search in shared files
 2013-09-27 05:18:12 -07:00
Morris Jobke f47ff13abf Merge pull request #5001 from owncloud/fixing-user-external-backends-master 
prelogin apps have to be loaded within setupBackend() otherwise required...
 2013-09-27 02:34:59 -07:00
Jenkins for ownCloud f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Thomas Müller e515509a81 prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded 2013-09-26 13:34:47 +02:00
Thomas Müller a86c10984a catching NotPermittedException and throw it to the dav client as 403 2013-09-26 11:50:46 +02:00
Thomas Müller b11d8799c1 adding unit tests for ObjectTree::move() 2013-09-26 10:50:15 +02:00
Arthur Schiwon 1c976a7c9b manager checkPassword now returns User object, adjust internal user class accordingly. 2013-09-25 15:03:22 +02:00
Thomas Müller 68bfcfbf77 Merge pull request #4968 from owncloud/user_checkpwd 
User: move checkPassword from User to Manager to not break API
 2013-09-25 05:28:42 -07:00
Jenkins for ownCloud 2d12e52769 [tx-robot] updated from transifex 2013-09-24 12:59:48 -04:00
Arthur Schiwon 14a160e176 Adjust Tests and satisfy them 2013-09-24 17:10:01 +02:00
Thomas Müller 84a0e6930b creating non static getETagPropertyForPath() 
adding public $fileView to Node to allow unit testing
 2013-09-24 15:35:21 +02:00
Thomas Müller 4e7f82ef04 unify duplicate code 2013-09-24 15:14:42 +02:00
Thomas Müller cf9dbc6e34 adding error handling on file_put_contents within the web dav implementation 2013-09-24 14:25:56 +02:00
Arthur Schiwon 63324e2347 Fix doc 2013-09-24 14:12:44 +02:00
Arthur Schiwon 0a7ee7c3f7 Fix return value from User object to User ID 2013-09-24 14:11:47 +02:00
Thomas Müller e9eb34f187 duplicate code :sigh: - will fix this in a second pr 2013-09-24 13:54:18 +02:00
Thomas Müller 6c5466a540 adding file_exists check just to be on the save side 2013-09-24 13:53:32 +02:00
Arthur Schiwon fe88a62d6e === not == 2013-09-24 13:51:33 +02:00
Arthur Schiwon d101ff42f1 User: move checkPassword from User to Manager to not break API 2013-09-24 13:46:30 +02:00
Thomas Müller ee1f627155 adding privilege check on move and rename operations 2013-09-24 13:26:12 +02:00
Georg Ehrke 31d2048eb8 add blacklist to txt preview backend 2013-09-24 11:00:08 +02:00
Thomas Müller cd2421c7ee adding PHPDoc comments to getBackend 
ensure getChildren() is called on an instance of Share_Backend_Collection
 2013-09-24 10:37:58 +02:00
Andreas Fischer 2129974584 Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData). 2013-09-24 00:59:23 +02:00
Robin Appelman 235517f111 clear permissions cache when scanning a file 2013-09-24 00:57:58 +02:00
Thomas Müller e55f25b64d handle error situation of rename proper 2013-09-23 22:04:37 +02:00
Thomas Müller 5d671a84b2 Merge pull request #4869 from owncloud/fixing-4866-master 
recreate an etag within the scanner if the cache contains an empty etag
 2013-09-23 07:13:12 -07:00
Andreas Fischer 437858852c Merge pull request #4856 from owncloud/fix-link-expiration 
Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token)

* owncloud/fix-link-expiration:
  Perform expiration date checking before returning share data for token.
  Tests whether expired/valid link share is still accessible.
 2013-09-23 15:12:38 +02:00
Andreas Fischer 4a9f1cc74d Merge remote-tracking branch 'owncloud/master' into fixing-4866-master 
* owncloud/master: (98 commits)
  [tx-robot] updated from transifex
  files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
  setting a default on filecache column unencrypted_size
  [tx-robot] updated from transifex
  remove unneccessary lib in namespace
  namespaces use upcasefirst parts when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app its magic!
  initialize variable
  calculate correct permissions while toggle the password protection
  make sure that both $permissions and $oldPermissions have the same type
  Add copyright, remove starting blank line
  update inherit docs comment
  Fix insert/update/delete helper functions for oracle
  Add missing return true statements to legacy preferences functions
  Add missing static
  Convert OC_Preference to object interface
  fix race condition in lazy preview loading
  use {count} instead of 'One' for more versatile translation
  fix double translation of error message
  use n to translate title
  fixing typos and l10n
  ...

Conflicts:
	tests/lib/files/cache/scanner.php
 2013-09-23 12:44:11 +02:00
Björn Schießle 9851f0f4f2 Merge pull request #4896 from owncloud/sharing_allow_disable_password 
sharing, allow user to disable password protection
 2013-09-23 01:20:09 -07:00
Thomas Müller 03eedb58fc Merge pull request #4327 from owncloud/scanfile-remove 
remove deleted files while scanning
 2013-09-22 22:40:13 -07:00
Bart Visscher 811f680457 Merge pull request #4623 from owncloud/convert-oc_preferences 
Convert OC_Preference to object interface
 2013-09-22 10:45:56 -07:00
Jenkins for ownCloud 28918d61d2 [tx-robot] updated from transifex 2013-09-22 12:58:42 -04:00
Robin Appelman a1d4eb1f95 files: when filtering search results, ensure results are children of the fakeroot not just path starting the same 2013-09-22 01:24:12 +02:00
Andreas Fischer 2a17025d53 Move bool to int conversion to buildParts(), so it also happens for update(). 2013-09-21 02:20:01 +02:00
Andreas Fischer 011bca7b7f Only update the etag. Do not re-submit any other unchanged data. 2013-09-20 23:53:02 +02:00
Andreas Fischer a2f82da572 Use update() instead of put(). 2013-09-20 23:52:05 +02:00
Thomas Müller d84d548618 when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy 2013-09-20 20:34:17 +02:00
Jenkins for ownCloud 5b95e7aa0f [tx-robot] updated from transifex 2013-09-20 10:50:14 -04:00
Bjoern Schiessle 944e9b8c69 make sure that both $permissions and $oldPermissions have the same type 2013-09-20 12:40:21 +02:00
Bart Visscher 8e26f291a7 Merge pull request #4684 from owncloud/improved-console 
Use more object oriented way for console commands
 2013-09-19 14:22:32 -07:00
Jörn Friedrich Dreyer e8bf576184 add initial search in shared files 2013-09-19 21:08:32 +03:00
Bart Visscher 0a2a4cb12e update inherit docs comment 2013-09-19 18:59:06 +02:00
Bart Visscher 55efe1e56c Fix insert/update/delete helper functions for oracle 2013-09-19 18:13:39 +02:00
Bart Visscher f6284bdce7 Add missing return true statements to legacy preferences functions 2013-09-19 18:13:06 +02:00
Bart Visscher 395cc737a1 Add missing static 2013-09-19 18:13:06 +02:00