]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Müller [Mon, 30 Sep 2013 08:58:03 +0000 (10:58 +0200)]
remove commented code
Thomas Müller [Mon, 30 Sep 2013 08:46:50 +0000 (10:46 +0200)]
Merge branch 'master' into fixing-4011-master
Conflicts:
lib/connector/sabre/directory.php
lib/connector/sabre/file.php
Thomas Müller [Mon, 30 Sep 2013 07:20:34 +0000 (00:20 -0700)]
Merge pull request #4969 from owncloud/fixing-4043-master
adding privilege check on move and rename operations
Thomas Müller [Mon, 30 Sep 2013 07:08:32 +0000 (00:08 -0700)]
Merge pull request #3563 from evgeni/curl-no-timeout
cURL does not honour default_socket_timeout
Evgeni Golov [Fri, 31 May 2013 16:21:31 +0000 (18:21 +0200)]
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.
Andreas Fischer [Sun, 29 Sep 2013 21:20:34 +0000 (23:20 +0200)]
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
Thomas Müller [Sun, 29 Sep 2013 19:49:10 +0000 (12:49 -0700)]
Merge pull request #4960 from owncloud/fixing-mirall-1014-master
handle error situation of rename proper
Thomas Müller [Sun, 29 Sep 2013 16:26:47 +0000 (09:26 -0700)]
Merge pull request #5031 from zimba12/master
followup of #4032 - makes the settings-button bigger...
Alessandro Cosentino [Sun, 29 Sep 2013 05:46:23 +0000 (01:46 -0400)]
followup of #4032 - makes the settings-button bigger and adds again padding at bottom of app-navigation
Jenkins for ownCloud [Sun, 29 Sep 2013 04:03:26 +0000 (00:03 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Sat, 28 Sep 2013 15:52:22 +0000 (08:52 -0700)]
Merge pull request #5030 from owncloud/base_defaultavatar_text_on_displayname
Base defaultavatar text on displayname
kondou [Sat, 28 Sep 2013 15:49:07 +0000 (17:49 +0200)]
Have uniform (wrong) indention
kondou [Sat, 28 Sep 2013 14:46:53 +0000 (16:46 +0200)]
Base defaultavatar text on displayname
Fix #4876
Morris Jobke [Sat, 28 Sep 2013 13:50:34 +0000 (06:50 -0700)]
Merge pull request #5004 from owncloud/phpunit-dist-coverage-excludes
phpunit.xml: Port code coverage excludes from autotest to dist.
Georg Ehrke [Fri, 27 Sep 2013 12:55:37 +0000 (14:55 +0200)]
rename variable in testIsTransparent
Thomas Müller [Fri, 27 Sep 2013 12:18:12 +0000 (05:18 -0700)]
Merge pull request #4207 from owncloud/search_shared_files
add initial search in shared files
Thomas Müller [Fri, 27 Sep 2013 11:41:23 +0000 (13:41 +0200)]
code cleanup
Thomas Müller [Fri, 27 Sep 2013 11:30:09 +0000 (13:30 +0200)]
remove unused setUp()
Morris Jobke [Fri, 27 Sep 2013 09:34:59 +0000 (02:34 -0700)]
Merge pull request #5001 from owncloud/fixing-user-external-backends-master
prelogin apps have to be loaded within setupBackend() otherwise required...
Georg Ehrke [Fri, 27 Sep 2013 09:33:37 +0000 (11:33 +0200)]
rename testTxtBlacklist to txtBlacklist
Georg Ehrke [Fri, 27 Sep 2013 09:01:47 +0000 (11:01 +0200)]
move fileView object initialization to testIsTransparent
Georg Ehrke [Fri, 27 Sep 2013 07:59:04 +0000 (09:59 +0200)]
use dataProvider for txt blacklist test
Jenkins for ownCloud [Fri, 27 Sep 2013 04:02:30 +0000 (00:02 -0400)]
[tx-robot] updated from transifex
Andreas Fischer [Thu, 26 Sep 2013 17:05:47 +0000 (19:05 +0200)]
phpunit.xml: Port code coverage excludes from autotest to dist.
Morris Jobke [Thu, 26 Sep 2013 14:09:32 +0000 (07:09 -0700)]
Merge pull request #4999 from owncloud/run-unit-tests-for-apps-master
run unit tests for apps as well
Thomas Müller [Thu, 26 Sep 2013 12:03:04 +0000 (14:03 +0200)]
Remove $RUNTIME_NOAPPS - setting to false was not enough
Thomas Müller [Thu, 26 Sep 2013 11:34:47 +0000 (13:34 +0200)]
prelogin apps have to be loaded within setupBackend() otherwise required classes cannot be loaded
blizzz [Thu, 26 Sep 2013 11:03:20 +0000 (04:03 -0700)]
Merge pull request #4990 from owncloud/user_fix_manager
manager checkPassword now returns User object, adjust internal user clas...
Björn Schießle [Thu, 26 Sep 2013 10:16:15 +0000 (03:16 -0700)]
Merge pull request #4887 from owncloud/sharing_disable_public_upload
check only permission from link-share to decide if public upload is enabled or disabled
Thomas Müller [Thu, 26 Sep 2013 10:15:14 +0000 (03:15 -0700)]
Merge pull request #4991 from owncloud/enc_fix_warning
check if key exists before reading it
Thomas Müller [Thu, 26 Sep 2013 10:02:06 +0000 (12:02 +0200)]
run unit tests for apps as well
Thomas Müller [Thu, 26 Sep 2013 09:50:46 +0000 (11:50 +0200)]
catching NotPermittedException and throw it to the dav client as 403
Thomas Müller [Thu, 26 Sep 2013 08:50:15 +0000 (10:50 +0200)]
adding unit tests for ObjectTree::move()
Bjoern Schiessle [Wed, 25 Sep 2013 17:23:07 +0000 (19:23 +0200)]
fix check if app is enabled
Arthur Schiwon [Wed, 25 Sep 2013 17:15:27 +0000 (19:15 +0200)]
Missing Test for the previous commit
Morris Jobke [Wed, 25 Sep 2013 17:11:52 +0000 (10:11 -0700)]
Merge pull request #4987 from owncloud/different_color_placeholder
Make it possible to have a different color than the username for placeholder
Bjoern Schiessle [Wed, 25 Sep 2013 15:44:05 +0000 (17:44 +0200)]
check if key exists before reading it
kondou [Wed, 25 Sep 2013 15:19:38 +0000 (17:19 +0200)]
Shorten optional text-argument processing
Thomas Müller [Wed, 25 Sep 2013 14:46:49 +0000 (07:46 -0700)]
Merge pull request #4989 from owncloud/coverage-for-all-master
collect coverage for all databases again - ci.owncloud.org has more RAM ...
Arthur Schiwon [Wed, 25 Sep 2013 13:03:22 +0000 (15:03 +0200)]
manager checkPassword now returns User object, adjust internal user class accordingly.
Thomas Müller [Wed, 25 Sep 2013 12:41:03 +0000 (14:41 +0200)]
collect coverage for all databases again - ci.owncloud.org has more RAM available
Thomas Müller [Wed, 25 Sep 2013 12:28:42 +0000 (05:28 -0700)]
Merge pull request #4968 from owncloud/user_checkpwd
User: move checkPassword from User to Manager to not break API
kondou [Wed, 25 Sep 2013 10:57:41 +0000 (12:57 +0200)]
Make it possible to have a different color than the username for placeholder
Georg Ehrke [Wed, 25 Sep 2013 08:20:40 +0000 (10:20 +0200)]
add test for txt blacklist
Jenkins for ownCloud [Tue, 24 Sep 2013 16:59:48 +0000 (12:59 -0400)]
[tx-robot] updated from transifex
Arthur Schiwon [Tue, 24 Sep 2013 15:10:01 +0000 (17:10 +0200)]
Adjust Tests and satisfy them
Thomas Müller [Tue, 24 Sep 2013 13:44:02 +0000 (15:44 +0200)]
adding basic unit test for failing file_put_content operation
Thomas Müller [Tue, 24 Sep 2013 13:35:21 +0000 (15:35 +0200)]
creating non static getETagPropertyForPath()
adding public $fileView to Node to allow unit testing
Thomas Müller [Tue, 24 Sep 2013 13:14:42 +0000 (15:14 +0200)]
unify duplicate code
Thomas Müller [Tue, 24 Sep 2013 12:25:56 +0000 (14:25 +0200)]
adding error handling on file_put_contents within the web dav implementation
Arthur Schiwon [Tue, 24 Sep 2013 12:12:44 +0000 (14:12 +0200)]
Fix doc
Arthur Schiwon [Tue, 24 Sep 2013 12:11:47 +0000 (14:11 +0200)]
Fix return value from User object to User ID
Thomas Müller [Tue, 24 Sep 2013 11:54:18 +0000 (13:54 +0200)]
duplicate code :sigh: - will fix this in a second pr
Thomas Müller [Tue, 24 Sep 2013 11:53:32 +0000 (13:53 +0200)]
adding file_exists check just to be on the save side
Arthur Schiwon [Tue, 24 Sep 2013 11:51:33 +0000 (13:51 +0200)]
=== not ==
Arthur Schiwon [Mon, 16 Sep 2013 12:15:35 +0000 (14:15 +0200)]
User: move checkPassword from User to Manager to not break API
Christopher [Tue, 24 Sep 2013 11:45:13 +0000 (04:45 -0700)]
Merge pull request #4963 from cyberb/patch-1
fixing typo
Georg Ehrke [Tue, 24 Sep 2013 11:26:51 +0000 (13:26 +0200)]
add test data for cal and contact preview
Thomas Müller [Tue, 24 Sep 2013 11:26:12 +0000 (13:26 +0200)]
adding privilege check on move and rename operations
Georg Ehrke [Tue, 24 Sep 2013 09:00:08 +0000 (11:00 +0200)]
add blacklist to txt preview backend
Thomas Müller [Tue, 24 Sep 2013 08:37:58 +0000 (10:37 +0200)]
adding PHPDoc comments to getBackend
ensure getChildren() is called on an instance of Share_Backend_Collection
Thomas Müller [Tue, 24 Sep 2013 08:02:50 +0000 (01:02 -0700)]
Merge pull request #4930 from owncloud/fix-apps-settings
Fix the apps enabling/disabling in settings
Thomas Müller [Tue, 24 Sep 2013 07:50:33 +0000 (00:50 -0700)]
Merge pull request #4917 from owncloud/scan-clear-permissions
clear permissions cache when scanning a file
Boris Rybalkin [Tue, 24 Sep 2013 01:08:58 +0000 (21:08 -0400)]
fixing typo
Typo in comment "feature" => "future"
Andreas Fischer [Mon, 23 Sep 2013 22:59:23 +0000 (00:59 +0200)]
Do not recheck $cacheData. Move if($reuseExisting) under if($cacheData).
Robin Appelman [Thu, 19 Sep 2013 19:37:52 +0000 (21:37 +0200)]
clear permissions cache when scanning a file
Thomas Müller [Mon, 23 Sep 2013 20:09:47 +0000 (13:09 -0700)]
Merge pull request #4956 from owncloud/fix_not_displaying_emptycontent
Fix not displaying "Upload something!" message
Thomas Müller [Mon, 23 Sep 2013 20:04:37 +0000 (22:04 +0200)]
handle error situation of rename proper
kondou [Mon, 23 Sep 2013 14:39:42 +0000 (16:39 +0200)]
Fix not displaying "Upload something!" message
Fix #4940
Thomas Müller [Mon, 23 Sep 2013 14:13:12 +0000 (07:13 -0700)]
Merge pull request #4869 from owncloud/fixing-4866-master
recreate an etag within the scanner if the cache contains an empty etag
Thomas Müller [Mon, 23 Sep 2013 13:31:50 +0000 (06:31 -0700)]
Merge pull request #4950 from owncloud/fix_preview_shared_folder
Fix preview for shared folder and public upload
Andreas Fischer [Mon, 23 Sep 2013 13:12:38 +0000 (15:12 +0200)]
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.
Andreas Fischer [Mon, 23 Sep 2013 10:45:02 +0000 (12:45 +0200)]
Move setUp() and tearDown() up in tests/lib/files/cache/scanner.php.
Andreas Fischer [Mon, 23 Sep 2013 10:44:11 +0000 (12:44 +0200)]
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
Georg Ehrke [Mon, 23 Sep 2013 10:27:05 +0000 (12:27 +0200)]
implement previews for public upload
Georg Ehrke [Mon, 23 Sep 2013 08:26:46 +0000 (10:26 +0200)]
fix previews in shared folders
Björn Schießle [Mon, 23 Sep 2013 08:20:09 +0000 (01:20 -0700)]
Merge pull request #4896 from owncloud/sharing_allow_disable_password
sharing, allow user to disable password protection
Thomas Müller [Mon, 23 Sep 2013 05:40:13 +0000 (22:40 -0700)]
Merge pull request #4327 from owncloud/scanfile-remove
remove deleted files while scanning
Bart Visscher [Sun, 22 Sep 2013 17:45:56 +0000 (10:45 -0700)]
Merge pull request #4623 from owncloud/convert-oc_preferences
Convert OC_Preference to object interface
Jenkins for ownCloud [Sun, 22 Sep 2013 16:58:42 +0000 (12:58 -0400)]
[tx-robot] updated from transifex
Morris Jobke [Sun, 22 Sep 2013 15:40:20 +0000 (08:40 -0700)]
Merge pull request #4929 from owncloud/fixing-4416-master
Fixing 4416 master
Jörn Friedrich Dreyer [Sun, 22 Sep 2013 08:01:59 +0000 (01:01 -0700)]
Merge pull request #4938 from owncloud/scan-filter-outside-view
When filtering search results, ensure results are children of the...
Robin Appelman [Sat, 21 Sep 2013 23:23:18 +0000 (01:23 +0200)]
files: when filtering search results, ensure results are children of the fakeroot not just path starting the same
Thomas Müller [Sat, 21 Sep 2013 18:54:06 +0000 (11:54 -0700)]
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
namespaces use upcasefirst parts
Andreas Fischer [Sat, 21 Sep 2013 00:20:01 +0000 (02:20 +0200)]
Move bool to int conversion to buildParts(), so it also happens for update().
Andreas Fischer [Fri, 20 Sep 2013 22:12:13 +0000 (00:12 +0200)]
Do not convert boolean to integer in tests. put() already does this.
Andreas Fischer [Fri, 20 Sep 2013 21:53:02 +0000 (23:53 +0200)]
Only update the etag. Do not re-submit any other unchanged data.
Andreas Fischer [Fri, 20 Sep 2013 21:52:05 +0000 (23:52 +0200)]
Use update() instead of put().
Thomas Müller [Fri, 20 Sep 2013 18:47:24 +0000 (20:47 +0200)]
setting a default on filecache column unencrypted_size
Thomas Müller [Fri, 20 Sep 2013 18:34:17 +0000 (20:34 +0200)]
when storing back the data field 'encrypted' it is necessary to cast the boolean to an integer to make pg happy
Bart Visscher [Fri, 20 Sep 2013 18:29:15 +0000 (20:29 +0200)]
Fix the apps enabling/disabling in settings
Jenkins for ownCloud [Fri, 20 Sep 2013 14:50:14 +0000 (10:50 -0400)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 14:46:33 +0000 (16:46 +0200)]
remove unneccessary lib in namespace
Jörn Friedrich Dreyer [Fri, 20 Sep 2013 14:37:07 +0000 (16:37 +0200)]
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!
Bjoern Schiessle [Fri, 20 Sep 2013 13:47:33 +0000 (15:47 +0200)]
initialize variable
Bjoern Schiessle [Fri, 20 Sep 2013 11:11:05 +0000 (13:11 +0200)]
calculate correct permissions while toggle the password protection
Bjoern Schiessle [Fri, 20 Sep 2013 10:40:21 +0000 (12:40 +0200)]
make sure that both $permissions and $oldPermissions have the same type
Bart Visscher [Thu, 19 Sep 2013 21:22:32 +0000 (14:22 -0700)]
Merge pull request #4684 from owncloud/improved-console
Use more object oriented way for console commands
Jörn Friedrich Dreyer [Wed, 28 Aug 2013 19:10:06 +0000 (21:10 +0200)]
same for search by mime
Jörn Friedrich Dreyer [Wed, 28 Aug 2013 19:04:21 +0000 (21:04 +0200)]
add all results, sharing cache also returns entries for shared files in external storages