]>
source.dussan.org Git - nextcloud-server.git/log
Vincent Petry [Mon, 16 Jun 2014 13:00:22 +0000 (15:00 +0200)]
Merge pull request #9008 from owncloud/repair-parent-stable6
Repair broken parent link in the scanner - stable6
Robin Appelman [Mon, 16 Jun 2014 11:37:08 +0000 (13:37 +0200)]
Fix unit test
Morris Jobke [Fri, 13 Jun 2014 11:09:41 +0000 (13:09 +0200)]
Merge pull request #9015 from owncloud/stable6-downloadwithdisabledzip
[stable6] Fix public download link when zip download is disabled
Vincent Petry [Fri, 13 Jun 2014 08:31:18 +0000 (10:31 +0200)]
Merge pull request #8988 from owncloud/stable6_fix_encryption
Stable6 fix encryption
Morris Jobke [Thu, 12 Jun 2014 22:19:36 +0000 (00:19 +0200)]
Merge pull request #9016 from owncloud/stable6-maxheartbeatinterval
[stable6] Added max heartbeat interval to prevent integer overflow
Vincent Petry [Thu, 12 Jun 2014 16:26:08 +0000 (18:26 +0200)]
Added max heartbeat interval to prevent integer overflow
When using big session timeout values, the interval value might overflow
and cause the setInterval() call to ping the server in a loop without
any delay.
This fix adds a maximum ping interval of 24 hours.
Vincent Petry [Thu, 12 Jun 2014 15:29:55 +0000 (17:29 +0200)]
Fix public download link when zip download is disabled
When zip download is disabled, the public download action defined in
public.js is overridden by the one in fileactions.js because of the JS
loading order.
This quick fix prevents the override to happen when a download action is
already defined.
There are additional changes that were required to make the download
action icon work when registered from the public page.
Robin Appelman [Tue, 10 Jun 2014 13:42:37 +0000 (15:42 +0200)]
remove unused argument
Robin Appelman [Tue, 10 Jun 2014 13:37:43 +0000 (15:37 +0200)]
add some comments
Robin Appelman [Tue, 10 Jun 2014 13:26:18 +0000 (15:26 +0200)]
Repair broken parent link in the scanner
Jörn Friedrich Dreyer [Mon, 7 Apr 2014 09:46:47 +0000 (11:46 +0200)]
Fix copy conflict dialog translation
backport of fileexist template translations
with minor fixes
Bjoern Schiessle [Wed, 11 Jun 2014 15:21:08 +0000 (17:21 +0200)]
fix rename of encryption keys
Vincent Petry [Tue, 10 Jun 2014 15:17:35 +0000 (17:17 +0200)]
Merge pull request #8970 from owncloud/cache-change-propagator-stable6
Cache change propagator stable6
Robin Appelman [Wed, 4 Jun 2014 08:01:50 +0000 (10:01 +0200)]
Fix unit tests
Robin Appelman [Tue, 3 Jun 2014 09:55:35 +0000 (11:55 +0200)]
Fix size calculation during recursive scan
Robin Appelman [Tue, 3 Jun 2014 09:34:48 +0000 (11:34 +0200)]
Fix unit tests
Robin Appelman [Mon, 2 Jun 2014 19:04:36 +0000 (21:04 +0200)]
Fix recursive scanning
Robin Appelman [Mon, 2 Jun 2014 13:17:00 +0000 (15:17 +0200)]
propagate changes in the scanner
Robin Appelman [Mon, 2 Jun 2014 12:52:21 +0000 (14:52 +0200)]
Split of cache writes in the scanner to their own methods
Robin Appelman [Fri, 30 May 2014 13:55:17 +0000 (15:55 +0200)]
Add a change propagator class to handle propagating etag and mtime changes
Thomas Müller [Fri, 6 Jun 2014 15:58:08 +0000 (17:58 +0200)]
Merge pull request #8885 from owncloud/flock-stable6
[stable6][WIP] Move Flock basics into stable6
Thomas Müller [Fri, 6 Jun 2014 13:48:02 +0000 (15:48 +0200)]
fix failing unit test
Jan-Christoph Borchardt [Thu, 17 Apr 2014 14:58:57 +0000 (16:58 +0200)]
keep long file names in one line to not overflow download button on mobile
Jan-Christoph Borchardt [Wed, 16 Apr 2014 14:43:35 +0000 (16:43 +0200)]
add max-width to directLink input to prevent overflow
Robin Appelman [Thu, 5 Jun 2014 08:18:26 +0000 (10:18 +0200)]
Dont backport unit tests for code that isn't backported
Thomas Müller [Wed, 4 Jun 2014 18:53:39 +0000 (20:53 +0200)]
added missing LockNotAcquiredException
ringmaster [Fri, 23 May 2014 14:29:37 +0000 (10:29 -0400)]
Continued flock work.
add actual locking and log changes necessary for debugging.
Simpler log unique id.
Respect locked files, surface correct exception.
Conflicts:
lib/private/connector/sabre/file.php
Remove unused methods.
Conflicts:
lib/private/files/storage/local.php
Fix typo
Fix typo
Removed unused vars/declarations, update PHPDoc.
Don't error out on console.
Move Lock to private namespace, add interface. Update PHPDoc.
Restore the reference to this used exception class.
make sure to close the stream at the end of each test
Normalize lock exception messages.
don't ask for fileInfo if we already have one
Conflicts:
apps/files_encryption/lib/proxy.php
name the storage wrapper to make sure that we don't apply the wrapper multiple times
Conflicts:
lib/private/util.php
fix unit test after adding the additional parameter to addStorageWrapper()
only lock if unlink is called for a file
Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead.
Conflicts:
tests/lib/files/filesystem.php
Use ->instanceOfStorage() not instanceof for Storage instances.
Conflicts:
lib/private/helper.php
get the storage from the view
Conflicts:
apps/files_encryption/tests/webdav.php
workaround to get the unit test going
Conflicts:
apps/files_encryption/hooks/hooks.php
Added isLocal() method to storage, used for xsendfile
Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.
Conflicts:
lib/private/files.php
Add ->instanceOfStorage to handle instanceof for storage wrappers
Conflicts:
lib/private/files/storage/common.php
lib/private/files/storage/wrapper/wrapper.php
lib/public/files/storage.php
Use instanceOfStorage instead of instanceof
Conflicts:
lib/private/files.php
Fix storage wrapper being called with null
Pass any methods custom to specific storage implementations to the wrapped storage
remove duplicate declaration of isLocal()
remove file locking - code will continue to live in it's own app
Vincent Petry [Thu, 5 Jun 2014 09:16:08 +0000 (11:16 +0200)]
Merge pull request #8870 from owncloud/storage-instanceof-stable6
Add storage->instanceOfStorage() - stable6
Robin Appelman [Thu, 29 May 2014 14:13:05 +0000 (16:13 +0200)]
Pass any methods custom to specific storage implementations to the wrapped storage
Robin Appelman [Thu, 29 May 2014 12:15:48 +0000 (14:15 +0200)]
Fix storage wrapper being called with null
Robin Appelman [Thu, 29 May 2014 11:52:58 +0000 (13:52 +0200)]
Use instanceOfStorage instead of instanceof
Robin Appelman [Thu, 29 May 2014 11:45:50 +0000 (13:45 +0200)]
Add ->instanceOfStorage to handle instanceof for storage wrappers
Thomas Müller [Wed, 4 Jun 2014 08:26:59 +0000 (10:26 +0200)]
Merge pull request #8847 from owncloud/stable6_backport_8557
Stable6 backport of #8557
Thomas Müller [Wed, 4 Jun 2014 07:34:39 +0000 (09:34 +0200)]
Merge pull request #8850 from owncloud/stable6_backport_8607
[backport] [stable6] Skip filescan but execute hooks
ringmaster [Fri, 16 May 2014 02:38:46 +0000 (22:38 -0400)]
[backport] [stable6] Skip filescan but execute hooks
Backport of #8607
ringmaster [Mon, 12 May 2014 15:08:28 +0000 (11:08 -0400)]
Allow apps to create custom session handlers.
blizzz [Mon, 2 Jun 2014 10:02:15 +0000 (12:02 +0200)]
Merge pull request #8579 from owncloud/ldap_nail_filter_on_upgrade
LDAP: fix filter can be reset and broken after upgrade from OC 5
Frank Karlitschek [Mon, 2 Jun 2014 09:56:36 +0000 (11:56 +0200)]
Merge pull request #8672 from owncloud/stable6-obfuscatepasswords
[backport] [stable6] Added password obfuscation for external storage config
Thomas Müller [Wed, 28 May 2014 15:44:40 +0000 (17:44 +0200)]
Merge pull request #8692 from owncloud/fix_unit_tests_oc6
fix failing unit tests on OC6
Arthur Schiwon [Wed, 28 May 2014 15:24:04 +0000 (17:24 +0200)]
simpler and better readable assignment
Thomas Müller [Wed, 28 May 2014 11:07:18 +0000 (13:07 +0200)]
Merge pull request #8683 from owncloud/log-upload-error-stable6
Log upload error stable6
Thomas Müller [Tue, 27 May 2014 21:44:09 +0000 (23:44 +0200)]
fix expectation - same as in master
Jan-Christoph Borchardt [Fri, 9 May 2014 09:09:31 +0000 (11:09 +0200)]
reduce multiselect max-width from 400 to 200px to not take too much space
Bjoern Schiessle [Fri, 23 May 2014 13:13:59 +0000 (15:13 +0200)]
don't expect depreciated OC_FilesystemView
Thomas Müller [Fri, 23 May 2014 09:45:35 +0000 (11:45 +0200)]
php upload errors are written to log
Vincent Petry [Tue, 18 Mar 2014 17:29:08 +0000 (18:29 +0100)]
Added password obfuscation for external storage config
Added obfuscation for all "password" options from external storages.
Added more ext storage unit tests config.
Added unit tests for reading/writing the configuration.
Added IV for ext storage password encryption
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the post_initMountPoints hook
Fixed ext storage unit test for groups
Squashed backport of
2c561c9c5072ce82e06bd5ab2c4ee81bc5d09d59 from
master.
Bjoern Schiessle [Mon, 19 May 2014 13:08:02 +0000 (15:08 +0200)]
only start migration if the encryption was initialized; allow to overwrite keys if no files exists
tomneedham [Wed, 2 Apr 2014 15:50:51 +0000 (15:50 +0000)]
Only accept success as 100 like the OCS spec does
Arthur Schiwon [Wed, 14 May 2014 11:27:23 +0000 (13:27 +0200)]
bump version and don't overwrite values on next update if not necessary
Arthur Schiwon [Wed, 14 May 2014 10:01:41 +0000 (12:01 +0200)]
get the correct version number for compare -.-
Vincent Petry [Tue, 13 May 2014 12:17:51 +0000 (14:17 +0200)]
Fixed getAbsolutePath case when path is "0"
Make sure to correctly check for string emptiness when the passed path
is "0".
Backport of
bab8c1f from master
Arthur Schiwon [Tue, 13 May 2014 15:47:00 +0000 (17:47 +0200)]
LDAP: set filter mode to raw, so filters will not be changed and broken after upgrade from oc5, when visiting the LDAP settings and opening filter tabs
Lukas Reschke [Sun, 11 May 2014 13:49:19 +0000 (15:49 +0200)]
Harden issubdirectory()
realpath() may return false in case the directory does not exist since we can not be sure how different PHP versions may behave here we do an additional check whether realpath returned false
Vincent Petry [Fri, 9 May 2014 14:57:53 +0000 (16:57 +0200)]
Merge pull request #8521 from owncloud/stable6-shareextstoragemountpointfix
[stable6] Fix sharing of ext storage mount points
Vincent Petry [Thu, 8 May 2014 11:33:55 +0000 (13:33 +0200)]
Fix getPathById for Oracle
Added extra code to handle the case of Oracle which saves empty strings
as null values.
Backport of
05dc694 from master
Vincent Petry [Fri, 9 May 2014 12:36:29 +0000 (14:36 +0200)]
Added unit test for sharing ext storage mount points
Backport of
f73a168 from master
Vincent Petry [Wed, 7 May 2014 16:23:00 +0000 (18:23 +0200)]
Fix sharing of ext storage mount points
When sharing an ext storage mount point, it will now use the name of the
mount point instead of an empty string for the target path.
Backport of
28f0e63 from master
Robin Appelman [Tue, 22 Apr 2014 14:05:30 +0000 (16:05 +0200)]
Fix getPath for storage roots
Vincent Petry [Sat, 15 Mar 2014 12:28:20 +0000 (13:28 +0100)]
Added PostgreSQL version warning + log on upgrade
Backport of
3cd09f2 ,
a25b86a ,
6bfeb34 from master
Morris Jobke [Mon, 5 May 2014 16:15:48 +0000 (18:15 +0200)]
fix getUserFolder() of server container
Georg Ehrke [Wed, 5 Mar 2014 12:20:50 +0000 (13:20 +0100)]
fix issue with spamming logging files when loading cached thumbnail
Conflicts:
lib/private/preview.php
Bjoern Schiessle [Mon, 31 Mar 2014 16:09:46 +0000 (18:09 +0200)]
always encrypt files to owner
Fabian Henze [Mon, 7 Apr 2014 13:31:34 +0000 (15:31 +0200)]
Add unit tests for OC_Helper::phpFileSize function
Fabian Henze [Wed, 2 Apr 2014 23:17:28 +0000 (01:17 +0200)]
Fix setting the max-upload-size for really large values.
php can only parse filesize units up to gigabytes, not terabytes or petabytes.
Frank Karlitschek [Tue, 29 Apr 2014 00:38:18 +0000 (02:38 +0200)]
6.0.3
Lukas Reschke [Mon, 28 Apr 2014 20:25:43 +0000 (22:25 +0200)]
Merge pull request #8389 from owncloud/reset-3rdparty-stable6
Update 3rdparty
Thomas Müller [Mon, 28 Apr 2014 18:38:48 +0000 (20:38 +0200)]
Update 3rdparty
Thomas Müller [Mon, 28 Apr 2014 18:29:06 +0000 (20:29 +0200)]
Merge pull request #8384 from owncloud/kill_office_fallback_stable6
backport
b68098ebbaaa3bd816d24c1ed304425e838ee6b8 to stable6
Volkan Gezer [Mon, 28 Apr 2014 18:24:17 +0000 (20:24 +0200)]
Update outdated comment
Georg Ehrke [Mon, 28 Apr 2014 10:05:10 +0000 (12:05 +0200)]
Lukas Reschke [Sun, 27 Apr 2014 16:34:35 +0000 (18:34 +0200)]
Clarify the trusted_domain error page
Backport of https://github.com/owncloud/core/pull/8372
Lukas Reschke [Sun, 27 Apr 2014 16:33:50 +0000 (18:33 +0200)]
Revert "Clarify the trusted_domain error page"
This reverts commit
4f9a5c9d3c4debfc1816184d9923b9cca5a8be83 .
Lukas Reschke [Sat, 26 Apr 2014 21:11:29 +0000 (23:11 +0200)]
Clarify the trusted_domain error page
Conflicts:
lib/base.php
Lukas Reschke [Sat, 26 Apr 2014 20:37:30 +0000 (22:37 +0200)]
Add another example to the trusted_domains config
Users often ask in IRC or the forum how to add another domain.
Hopefully they will be able to find it out on their own if we have an example with two domains.
Morris Jobke [Sat, 26 Apr 2014 08:34:36 +0000 (10:34 +0200)]
Merge pull request #8365 from owncloud/stable6-external-storage-css-fix
fix layout of external storage config table
Morris Jobke [Fri, 25 Apr 2014 14:34:48 +0000 (16:34 +0200)]
fix layout of external storage config table
Conflicts:
apps/files_external/css/settings.css
Frank Karlitschek [Wed, 23 Apr 2014 14:49:44 +0000 (16:49 +0200)]
6.0.3 RC1
blizzz [Wed, 23 Apr 2014 14:30:26 +0000 (16:30 +0200)]
Merge pull request #7745 from owncloud/fix_6946_stable6
Group Database backend must not gather user details itself but ask user backends, fixes #6946 in stable6
Lukas Reschke [Wed, 23 Apr 2014 12:37:07 +0000 (14:37 +0200)]
Merge pull request #8261 from owncloud/stable6-backport-8182
Backport of #8182
Arthur Schiwon [Wed, 23 Apr 2014 11:55:21 +0000 (13:55 +0200)]
fix after rebase
Arthur Schiwon [Mon, 14 Apr 2014 15:54:14 +0000 (17:54 +0200)]
keep the constant to not provoke PHP warnings
Arthur Schiwon [Sat, 15 Mar 2014 09:32:16 +0000 (10:32 +0100)]
trim must not be used in empty in PHP < 5.5
Arthur Schiwon [Sat, 15 Mar 2014 07:11:10 +0000 (08:11 +0100)]
test for group manager's displayNamesInGroup
Arthur Schiwon [Sat, 15 Mar 2014 05:41:46 +0000 (06:41 +0100)]
adjust user manager tests
Arthur Schiwon [Sat, 15 Mar 2014 05:03:28 +0000 (06:03 +0100)]
implement getDisplayNames in group manager
Arthur Schiwon [Fri, 14 Mar 2014 12:57:25 +0000 (13:57 +0100)]
remove now unnecessary test
Arthur Schiwon [Fri, 14 Mar 2014 12:54:22 +0000 (13:54 +0100)]
clean up group backends
Arthur Schiwon [Fri, 14 Mar 2014 12:52:54 +0000 (13:52 +0100)]
LDAP: getDisplayNamesInGroup is not an option for group backends anymore
Arthur Schiwon [Fri, 14 Mar 2014 12:51:17 +0000 (13:51 +0100)]
remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends
Thomas Müller [Wed, 23 Apr 2014 10:04:09 +0000 (12:04 +0200)]
Merge pull request #8260 from owncloud/stable6-backport-8183-and-co
Backport of #8183 and #8197
ben-denham [Fri, 28 Feb 2014 02:07:25 +0000 (15:07 +1300)]
Backport of #8164
Added improved version of patch by @blizzz in https://github.com/owncloud/core/issues/6651#issuecomment-
32261257 to stop filter settings from being reset under a race condition.
Moved LdapFilter into a separate js file in user_ldap.
Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation.
fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh
Give hint when composing filter failed
fixing some JSHint warnings
Thomas Müller [Tue, 22 Apr 2014 21:59:03 +0000 (23:59 +0200)]
Update 3rdparty submodule
Lukas Reschke [Fri, 18 Apr 2014 09:46:48 +0000 (11:46 +0200)]
Check whether the user has permissions to add personal storage backends
Quick’n dirty back port of #8182 - master has a better fix but that
should be good enough…
missing return - OCP\JSON::success does not terminate the PHP process - which is good ;-)
Use error instead of success
Revert "Use error instead of success"
This reverts commit
e2d5535a5aa436c3896e46f0b9e8ff1bd5640d4d .
Use error instead of success
blizzz [Tue, 22 Apr 2014 16:35:47 +0000 (18:35 +0200)]
Merge pull request #8232 from owncloud/fix_8135
LDAP: optimize retrieval of displaynames, fixes #8135
Bernhard Posselt [Fri, 18 Apr 2014 20:29:57 +0000 (22:29 +0200)]
Merge pull request #8265 from owncloud/appframework-fix-backports
Appframework fix backports
Bernhard Posselt [Wed, 9 Apr 2014 21:59:57 +0000 (23:59 +0200)]
merge middleware string registration
Bernhard Posselt [Fri, 11 Apr 2014 18:50:49 +0000 (20:50 +0200)]
use references for middleware to fix problems on 5.3
Bernhard Posselt [Thu, 10 Apr 2014 18:51:03 +0000 (20:51 +0200)]
merge dicontainer
Bernhard Posselt [Sat, 12 Apr 2014 14:17:49 +0000 (16:17 +0200)]
default to GET request when no method is set to fix unittests, also set parsed json parameters on the post attribute
Bernhard Posselt [Sat, 12 Apr 2014 13:02:19 +0000 (15:02 +0200)]
Correctly process request parameters other than GET or POST, dont use globals in the class but inject it