]>
source.dussan.org Git - nextcloud-server.git/log
Thomas Müller [Tue, 27 May 2014 21:44:09 +0000 (23:44 +0200)]
fix expectation - same as in master
Bjoern Schiessle [Fri, 23 May 2014 13:13:59 +0000 (15:13 +0200)]
don't expect depreciated OC_FilesystemView
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
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
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
Lukas Reschke [Fri, 18 Apr 2014 09:36:59 +0000 (11:36 +0200)]
Merge pull request #8259 from owncloud/backport-7682-6
Backport #7682
Lukas Reschke [Fri, 18 Apr 2014 09:19:47 +0000 (11:19 +0200)]
Backport of #8197 to stable6
This extends mimetypes.list.php to be a white-list of known secure mime
types as well as offering secure alternatives for know potentially
malicious mime types.
I kept this in the OC_Helper and OC\Files\Type\Detection classes as
each backend has its own way of detecting mime types.
This supersedes #8184 as discussed in owncloud/security-tracker#56
Lukas Reschke [Fri, 18 Apr 2014 09:13:47 +0000 (11:13 +0200)]
Backport of #8183 to stable6
Some headers were currently only added to the templates but not to
other components (e.g. SabreDAV / JSON / etc...)
The migration to base.php ensures that the headers are served to all
requests passing base.php
Lukas Reschke [Fri, 18 Apr 2014 08:36:04 +0000 (10:36 +0200)]
Backport of #7682 to stable6
Lukas Reschke [Thu, 17 Apr 2014 08:40:19 +0000 (10:40 +0200)]
Use JS as content-type due to mimesniffing
Robin Appelman [Thu, 17 Apr 2014 10:32:52 +0000 (12:32 +0200)]
Verify that a file exists before we share it
Arthur Schiwon [Wed, 16 Apr 2014 15:16:51 +0000 (17:16 +0200)]
add additional comments, PHPdoc and check whether it's really applicable
Arthur Schiwon [Wed, 16 Apr 2014 10:56:08 +0000 (12:56 +0200)]
LDAP: cache display names immediately on retrieval, saves tens of unecessary queries to LDAP server in the share dialog for example
Arthur Schiwon [Wed, 19 Mar 2014 23:21:14 +0000 (00:21 +0100)]
Backport of PR #7815, correct LDAP user count on setup with many users
(occ user:report)
LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0
LDAP: fix user report i.e. count for LDAP servers with really many users
initialize variable
var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop
Put inner loop into own method, let's see whether it makes scrutinizer happier
Arthur Schiwon [Tue, 15 Apr 2014 15:53:57 +0000 (17:53 +0200)]
adjust tests accordingly
Arthur Schiwon [Tue, 15 Apr 2014 15:46:48 +0000 (17:46 +0200)]
Remove limit and offset manipulation when getting users or groups, because it does not work when more than one user or group backend. Fixing it would be too costly performancewise, so we switch back to the model used in OC 5: limit and offset are effective per backend, and not a general constraint
blizzz [Mon, 14 Apr 2014 08:23:57 +0000 (10:23 +0200)]
Merge pull request #8166 from owncloud/ldap_update_email
Also check for email address on userExists (next to Avatar and Quota)
Arthur Schiwon [Fri, 11 Apr 2014 16:33:58 +0000 (18:33 +0200)]
LDAP: fetch email from LDAP on userExists check as well (along to Quota and Avatar)
Thomas Müller [Fri, 11 Apr 2014 10:30:18 +0000 (12:30 +0200)]
Merge pull request #8150 from owncloud/backport-8138-stable6
To isolate the variable scope used inside the $file it is required in i...
Bernhard Posselt [Thu, 10 Apr 2014 19:34:57 +0000 (21:34 +0200)]
Merge pull request #8151 from owncloud/backport-8137-stable6
add requirements to routing
Bernhard Posselt [Thu, 10 Apr 2014 17:41:10 +0000 (19:41 +0200)]
Merge pull request #8119 from Raydiation/stable6
Remove dependency on container, removing service locator antipattern
Vincent Petry [Tue, 8 Apr 2014 09:57:33 +0000 (11:57 +0200)]
Fixed Sabre Node implementation to correctly return timestamps as int
Negative timestamps were returned as string and were confusing other
Sabre API like Sabre_DAV_Property_GetLastModified.
This fix makes sure the timestamp is returned as int when defined.
Backport of
4f11786 from master
Vincent Petry [Thu, 10 Apr 2014 15:28:00 +0000 (17:28 +0200)]
Merge pull request #8148 from owncloud/backport-6676-stable6
Disabled internet checking as mentioned when in proxy mode
Bernhard Posselt [Thu, 10 Apr 2014 14:43:57 +0000 (16:43 +0200)]
Update controller.php
Backwards compability fix for faster merge ;)
Bernhard Posselt [Wed, 9 Apr 2014 19:57:32 +0000 (21:57 +0200)]
add requirements to routing
Conflicts:
tests/lib/appframework/routing/RoutingTest.php
Thomas Müller [Thu, 10 Apr 2014 14:20:42 +0000 (16:20 +0200)]
fix code formatting
Thomas Müller [Thu, 10 Apr 2014 14:15:04 +0000 (16:15 +0200)]
To isolate the variable scope used inside the $file it is required in it's own method - refs #8138
Joan [Fri, 10 Jan 2014 08:33:35 +0000 (09:33 +0100)]
Disabled internet checking as mentioned when in proxy mode
Morris Jobke [Wed, 9 Apr 2014 11:41:08 +0000 (13:41 +0200)]
Merge pull request #8123 from owncloud/fix_filename_closing_tag
fix double closing </a> for filenames
Arthur Schiwon [Thu, 20 Mar 2014 12:58:08 +0000 (13:58 +0100)]
Backport of PR #7837 to stable6
LDAP Wizard: when determining objectclasses, we realy do not need to look at every entry. Fixes #7530
Conflicts:
apps/user_ldap/lib/wizard.php
Fix wildcard handling and check even less DNs per filter, enough will be looked at anyway
Use the LDAP wrapper for checking resources, needs for proper testing
fix potential infinite loop when the DN of the first entry was already read.
add tests for cumulativeSearchOnAttribute
make tests work on systems without php5_ldap
define var
add comment to clearify when a skip in the foreach happens
Jörn Friedrich Dreyer [Wed, 9 Apr 2014 09:15:08 +0000 (11:15 +0200)]
fix double closing </a> for filenames
Bernhard Posselt [Wed, 2 Apr 2014 15:54:33 +0000 (17:54 +0200)]
Remove dependency on container, removing service locator antipattern
Vincent Petry [Wed, 12 Mar 2014 15:57:39 +0000 (16:57 +0100)]
Fixed chunking and insufficient storage check
- fixed free space detection based on the already uploaded chunks
- now deleting chunks as soon as it is read out before writing it into
the part file, which reduces the space needed when assembling part
files
Backport of
4033eba from master
Vincent Petry [Thu, 3 Apr 2014 19:12:35 +0000 (21:12 +0200)]
Do not expire chunks while checking for their existence
The expiration should be done by the gc() function on login, not while
isComplete() is calling hasKey() for every chunk.
Backport of
ab56f694160f58f075069560953cba86cdfe5aec from master
blizzz [Fri, 4 Apr 2014 14:34:48 +0000 (16:34 +0200)]
Merge pull request #8038 from owncloud/fix_8028
Meanwhile, the quota value is stored human-readable in the DB
Robin Appelman [Thu, 16 Jan 2014 13:07:16 +0000 (14:07 +0100)]
Add bindParam to statement wrapper
Robin Appelman [Fri, 4 Apr 2014 11:06:54 +0000 (13:06 +0200)]
fix unit tests
Thomas Müller [Thu, 3 Apr 2014 21:05:41 +0000 (23:05 +0200)]
Merge pull request #8037 from owncloud/fix-7216
authentication apps need to be loaded in any case - fixes #7216
Arthur Schiwon [Thu, 3 Apr 2014 18:51:05 +0000 (20:51 +0200)]
Meanwhile, the quota value is stored human-readable in the DB
Thomas Müller [Thu, 3 Apr 2014 18:47:38 +0000 (20:47 +0200)]
authentication apps need to be loaded in any case - fixes #7216
Robin Appelman [Mon, 17 Mar 2014 11:53:26 +0000 (12:53 +0100)]
use a non-recursive chmod on the datadir
Robin Appelman [Mon, 31 Mar 2014 12:29:55 +0000 (14:29 +0200)]
Improve phpdoc
Robin Appelman [Fri, 28 Mar 2014 14:26:15 +0000 (15:26 +0100)]
Implement getPath for shared files
Robin Appelman [Thu, 27 Mar 2014 15:43:34 +0000 (16:43 +0100)]
Give storages the option to implement the getById behaviour for View->getPath
blizzz [Wed, 2 Apr 2014 17:24:22 +0000 (19:24 +0200)]
Merge pull request #7931 from owncloud/fix_7785_stable6
LDAP: Read email and quota when mapping user, fixes #7785
Volkan Gezer [Wed, 2 Apr 2014 10:41:46 +0000 (12:41 +0200)]
Fix admin-dir_permissions redirection when cannot write warning
is shown.
Arthur Schiwon [Wed, 2 Apr 2014 09:01:29 +0000 (11:01 +0200)]
more precise php doc
Arthur Schiwon [Tue, 1 Apr 2014 19:57:01 +0000 (21:57 +0200)]
add PHP docs
Jan-Christoph Borchardt [Thu, 27 Mar 2014 15:06:37 +0000 (16:06 +0100)]
general styles for the content area
Rodrigo Hjort [Fri, 28 Mar 2014 18:08:59 +0000 (15:08 -0300)]
Correction: failure on sharing when user ID was prefixed by zero
Backport of
51b727c from master
Vincent Petry [Tue, 1 Apr 2014 16:41:33 +0000 (18:41 +0200)]
Merge pull request #7976 from owncloud/fix-7973-stable6-2
remove pl_PL - fixes #7973
Thomas Müller [Tue, 1 Apr 2014 11:42:58 +0000 (13:42 +0200)]
Revert "remove Sabre_DAV_Browser_Plugin"
This reverts commit
e4104e63d924c41e80a42282cce2a7e09ec36c42 .