]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Sun, 31 Aug 2014 07:49:19 +0000 (09:49 +0200)]
Add optional user ID parameter for getUseFolder
Conflicts:
lib/private/server.php
Arthur Schiwon [Fri, 29 Aug 2014 13:17:37 +0000 (15:17 +0200)]
retrieve local users, groups and group members in a sorted way
Thomas Müller [Fri, 29 Aug 2014 15:07:21 +0000 (17:07 +0200)]
Merge pull request #10694 from owncloud/allow_empty_hostname_and_dots_in_service_name_for_oracle_autosetup
allow empty hostname and dots in service name for oracle autosetup
Jörn Friedrich Dreyer [Thu, 28 Aug 2014 13:54:28 +0000 (15:54 +0200)]
allow empty hostname and dots in service name for oracle autosetup
blizzz [Thu, 28 Aug 2014 09:33:42 +0000 (11:33 +0200)]
Merge pull request #10631 from owncloud/fixWizardTest_stable6
fix wizard test, adjust to changed parameters of the tested method, intr...
Lukas Reschke [Wed, 27 Aug 2014 15:01:51 +0000 (17:01 +0200)]
Escape error messages
Jörn Friedrich Dreyer [Wed, 27 Aug 2014 09:46:08 +0000 (11:46 +0200)]
Merge pull request #10660 from owncloud/use_notification_to_show_error_on_new_via_web_stable6
use notification to show error on new via web
Jörn Friedrich Dreyer [Wed, 27 Aug 2014 08:44:10 +0000 (10:44 +0200)]
use notification to shw error on new via web
Frank Karlitschek [Tue, 26 Aug 2014 10:04:32 +0000 (12:04 +0200)]
6.0.5
Arthur Schiwon [Tue, 26 Aug 2014 08:50:00 +0000 (10:50 +0200)]
fix wizard test, adjust to changed parameters of the tested method, introduced by
9caa354cfc1f73159f335646ca89be4db72b125e
Jörn Friedrich Dreyer [Mon, 25 Aug 2014 13:17:37 +0000 (15:17 +0200)]
Merge pull request #10448 from owncloud/check_quota_on_new_via_web_stable6
check quota when trying to download a file via new -> web
Frank Karlitschek [Thu, 21 Aug 2014 03:37:53 +0000 (05:37 +0200)]
6.0.5 RC1
Lukas Reschke [Sun, 13 Apr 2014 13:24:35 +0000 (15:24 +0200)]
Also encode > and '
Jörn Friedrich Dreyer [Tue, 19 Aug 2014 09:29:09 +0000 (11:29 +0200)]
properly encode groups as json, not ',' separated
Bjoern Schiessle [Mon, 18 Aug 2014 14:39:25 +0000 (16:39 +0200)]
set incognitoMode to true, getUser should always return false during public upload
Lukas Reschke [Sun, 17 Aug 2014 17:11:10 +0000 (19:11 +0200)]
Merge pull request #10146 from owncloud/fix-8578-stable6
Update 3rdparty to replace fpassthru() in Sabre.
Jörn Friedrich Dreyer [Fri, 8 Aug 2014 12:35:33 +0000 (14:35 +0200)]
check quota when trying to download a file via new -> web
Clark Tomlinson [Fri, 15 Aug 2014 13:03:29 +0000 (09:03 -0400)]
Merge pull request #10440 from owncloud/enforce-debug
Remove ability to trigger DEBUG mode via cookie
Lukas Reschke [Fri, 15 Aug 2014 12:07:52 +0000 (14:07 +0200)]
Merge pull request #10034 from owncloud/remove-es_MX-from-stable6
Remove es mx from stable6
Bjoern Schiessle [Thu, 14 Aug 2014 15:51:16 +0000 (17:51 +0200)]
we need the recipient as a additional parameter to know for which share the notification was send
Vincent Petry [Thu, 14 Aug 2014 11:56:27 +0000 (13:56 +0200)]
Fix Upload button does not disappear
Tipsy tooltip must be hidden when the upload starts. Otherwise it covers
the progress bar and stays in DOM.
Backport of
fa28c089fa3ffb72e97ca0f89cbfade3d0a8a8a5 and
90839b784f748b18a2a5fae4cc3f80bd1df7b355 from master
Volkan Gezer [Sat, 3 May 2014 12:41:36 +0000 (14:41 +0200)]
Minor changes in config.sample
* appcodechecker accepts boolean.
* using different ports in trusted domains
Partially fixes #330
Bjoern Schiessle [Tue, 12 Aug 2014 13:16:16 +0000 (15:16 +0200)]
fix broken variable name, recoveryPasswordSupported is now recoveryEnabledForUser
Bjoern Schiessle [Tue, 5 Aug 2014 13:55:28 +0000 (15:55 +0200)]
add unit tests
Bjoern Schiessle [Tue, 5 Aug 2014 13:25:52 +0000 (15:25 +0200)]
fix detection of system wide mount points
Lukas Reschke [Mon, 11 Aug 2014 19:31:53 +0000 (21:31 +0200)]
Merge pull request #10344 from owncloud/backport-10096-stable6
in case $_POST['itemSourceName'] does not exist we simply default it to...
Thomas Müller [Mon, 11 Aug 2014 15:56:36 +0000 (17:56 +0200)]
in case $_POST['itemSourceName'] does not exist we simply default it to null
Jean-Louis Dupond [Thu, 24 Jul 2014 12:18:41 +0000 (14:18 +0200)]
backport of #9848
Fix memberOf detection. Fixes: #9835
Conflicts:
apps/user_ldap/lib/wizard.php
Fix remarks in #9848
Conflicts:
apps/user_ldap/lib/wizard.php
Fix initializing in #9848
do not change var names here
Frank Karlitschek [Sun, 10 Aug 2014 21:11:31 +0000 (17:11 -0400)]
Merge pull request #10315 from owncloud/clarify-encryption-descripti
clearify the use-case of this app
Lukas Reschke [Sat, 9 Aug 2014 20:59:42 +0000 (22:59 +0200)]
clearify the use-case of this app
Backport of https://github.com/owncloud/core/commit/
8a24e1eb9624 to stable7
Jörn Friedrich Dreyer [Sat, 9 Aug 2014 00:41:33 +0000 (02:41 +0200)]
Merge pull request #9675 from owncloud/stable6-9647
[stable6] Add unit test for multi-user configuration loading
Robin McCorkell [Tue, 15 Jul 2014 17:39:09 +0000 (18:39 +0100)]
Add unit test for multi-user configuration loading
Andreas Fischer [Mon, 4 Aug 2014 13:15:55 +0000 (15:15 +0200)]
Update 3rdparty to replace fpassthru() in Sabre.
Georg Ehrke [Wed, 30 Jul 2014 15:06:41 +0000 (17:06 +0200)]
don't preload videos on public sharing, fixes #10042
Morris Jobke [Fri, 25 Jul 2014 22:04:49 +0000 (00:04 +0200)]
Fix template rendering for 'blank' templates
Thomas Müller [Tue, 29 Jul 2014 20:51:14 +0000 (22:51 +0200)]
remove l10n folder - sync script and transifex config are no longer required on a stable branch
Thomas Müller [Tue, 29 Jul 2014 20:48:21 +0000 (22:48 +0200)]
remove language es_MX
Vincent Petry [Tue, 22 Jul 2014 16:25:45 +0000 (18:25 +0200)]
Merge pull request #9575 from owncloud/fix-7038
Hack to avoid Agent DN + Password being overwritten by some ugly browser...
Thomas Müller [Tue, 22 Jul 2014 14:42:31 +0000 (16:42 +0200)]
Merge pull request #9776 from owncloud/backport-9738-stable6
Backport 9738 stable6
Lukas Reschke [Sat, 19 Jul 2014 08:17:24 +0000 (10:17 +0200)]
Remove uneeded `strip_tags`
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)
Needs https://github.com/owncloud/core/pull/9735 to be merged first.
Andreas Fischer [Sat, 19 Jul 2014 00:16:28 +0000 (02:16 +0200)]
Extract Auth Header logic into new function handleAuthHeaders().
Conflicts:
lib/base.php
Andreas Fischer [Sat, 19 Jul 2014 00:06:37 +0000 (02:06 +0200)]
Deduplicate user/password extraction from alternative HTTP headers.
Vincent Petry [Tue, 22 Jul 2014 13:28:00 +0000 (15:28 +0200)]
Merge pull request #9109 from owncloud/stable6-extstorage-multiplemountpointconfig
[6.0.5] Fix merging of external storage configurations
Vincent Petry [Fri, 18 Jul 2014 13:03:17 +0000 (15:03 +0200)]
Merge pull request #9717 from owncloud/backport_9668
[encryption] update keys recursively if a folder was moved (oc6 backport)
Andreas Fischer [Sat, 12 Jul 2014 18:41:35 +0000 (20:41 +0200)]
login() must be called after getServerPublicHostKey().
Bjoern Schiessle [Fri, 18 Jul 2014 10:12:32 +0000 (12:12 +0200)]
make sure that we don't connect hooks multiple times
Bjoern Schiessle [Fri, 18 Jul 2014 08:51:22 +0000 (10:51 +0200)]
check that the file proxies are enabled after each test
Bjoern Schiessle [Thu, 17 Jul 2014 12:28:52 +0000 (14:28 +0200)]
update keys recursively if a folder was moved
Arthur Schiwon [Thu, 10 Jul 2014 17:33:53 +0000 (19:33 +0200)]
Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials
Vincent Petry [Tue, 15 Jul 2014 15:36:45 +0000 (17:36 +0200)]
Merge pull request #9511 from owncloud/stable6-download-button-public-folder
[stable6] Bring back the download button public folder
Vincent Petry [Tue, 15 Jul 2014 15:11:49 +0000 (17:11 +0200)]
Merge pull request #9635 from owncloud/stable6-files_external_fix_readData
[stable6 backport] Permit personal mount points to be used for sharing
Robin McCorkell [Mon, 21 Apr 2014 20:41:45 +0000 (21:41 +0100)]
Permit personal mount points to be used for sharing
An issue existed where `readData` used `OCP\User::getUser()` to get the user
for personal mount points, which worked in all situations apart from when a
personal mount point was used for sharing, so the return from `getUser()` is
not the user that owns the share. As such, any personal mount points would not
work correctly when shared.
`readData` and `writeData` have been changed from using a `$isPersonal`
boolean to using a `$user` string|null. `$isPersonal = false` can now be
written as `$user = NULL` (or left out in the case of `readData`), and
`$isPersonal = true` can be written as `$user = OCP\User::getUser()`.
Backport of
abfd7ec from master
Vincent Petry [Tue, 15 Jul 2014 10:15:25 +0000 (12:15 +0200)]
Merge pull request #9618 from owncloud/fix_8345
throw exception if file is to large for trash bin
Thomas Müller [Fri, 11 Jul 2014 14:51:59 +0000 (16:51 +0200)]
append file extension to the temporary file which contains the downloaded archive - in case of zip files fileinfo doesn't seem to return anything reliable
Bjoern Schiessle [Mon, 14 Jul 2014 15:03:36 +0000 (17:03 +0200)]
throw exception if file is to large for trash bin
blizzz [Fri, 11 Jul 2014 11:30:22 +0000 (13:30 +0200)]
Merge pull request #9581 from owncloud/backport-9500
Backport of #9500 to stable6
Arthur Schiwon [Thu, 10 Jul 2014 22:13:52 +0000 (00:13 +0200)]
do not write to appconfig or preference tables if the value is unchanged
Arthur Schiwon [Thu, 10 Jul 2014 21:48:38 +0000 (23:48 +0200)]
don't trigger update from checkPassword, it is already called by userExists, this is enough.
Vincent Petry [Wed, 9 Jul 2014 15:58:54 +0000 (17:58 +0200)]
Merge pull request #9523 from owncloud/stable6-fix-9302-master
[stable6] Upload abortion is now detected within the OC_Connector_Sabre_File::put...
Thomas Müller [Tue, 8 Jul 2014 07:44:46 +0000 (09:44 +0200)]
Upload abortion is now detected within the OC_Connector_Sabre_File::put()
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless
Adding unit test testUploadAbort()
Backport of
ea269f0 from master
Christopher T. Johnson [Mon, 14 Apr 2014 13:49:43 +0000 (09:49 -0400)]
Fix Signiture Does Not Match when mounting Amazon S3 external storage
For some reason the aws-sdk-php package does not caclulate the
signiture correctly when accessing an object in a bucket with a name of
'.'.
When we are at the top of a S3 bucket there is a need(?) to have a directory
name. Per standard Unix the name picked was '.' (dot or period). This
choice exercises the aws-sdk bug.
This fix is to add a field to the method to store the name to use instead of
'.' which at this point is hard coded to '<root>'. We also add a private
function 'cleanKey()' which will test for the '.' name and replace it with
the variable. Finally all calls to manipulate objects where the path is
not obviously not '.' are processed through cleanKey().
An example where we don't process through clean key would be
'Key' => $path.'/',
Use correct relationship operator
Per feed back use === instead of ==
use '/' instead of '<root>'
Thomas Müller [Fri, 2 May 2014 13:51:41 +0000 (15:51 +0200)]
disable download button if zip download is disabled
Backport of
6e75b37
Jan-Christoph Borchardt [Fri, 2 May 2014 13:24:23 +0000 (15:24 +0200)]
fix position and look of public download button
Backport of
899c7c0 from master
Jan-Christoph Borchardt [Fri, 2 May 2014 13:14:41 +0000 (15:14 +0200)]
remove unneeded header-right details styles
Backport
a280a69
Thomas Müller [Tue, 29 Apr 2014 15:16:14 +0000 (17:16 +0200)]
remove file name from upper right button
Backport of
003049e from master
Thomas Müller [Tue, 29 Apr 2014 13:28:35 +0000 (15:28 +0200)]
reintroduce download button on public shares
Backport of
df32254 from master
Arthur Schiwon [Fri, 4 Jul 2014 13:15:45 +0000 (15:15 +0200)]
Backport of #9156
Björn Schießle [Tue, 1 Jul 2014 09:15:21 +0000 (11:15 +0200)]
Merge pull request #9250 from owncloud/enc_check_if_file_exists_oc6
[encryption] check if file exists (OC6)
Bjoern Schiessle [Mon, 30 Jun 2014 14:28:40 +0000 (16:28 +0200)]
improved error message
Bjoern Schiessle [Thu, 26 Jun 2014 15:38:06 +0000 (17:38 +0200)]
unit tests
Bjoern Schiessle [Wed, 25 Jun 2014 17:21:55 +0000 (19:21 +0200)]
check if file exists before deleting keys, and add debug output for every
delete operation
Vincent Petry [Fri, 27 Jun 2014 14:49:01 +0000 (16:49 +0200)]
Merge pull request #9251 from owncloud/enc_always_find_mount_point
[encryption] make sure that we always detect the system wide mount point
Bjoern Schiessle [Fri, 27 Jun 2014 10:20:29 +0000 (12:20 +0200)]
normalize path before comparison to make sure that we always find the mount point
Björn Schießle [Thu, 26 Jun 2014 13:11:55 +0000 (15:11 +0200)]
Merge pull request #9173 from owncloud/enc_always_use_oc_filesview_oc6
[encryption] always use oc filesview, backport for OC6
Morris Jobke [Thu, 26 Jun 2014 11:40:33 +0000 (13:40 +0200)]
Merge pull request #9219 from owncloud/stable6-trashwarning
[stable6] Fix trashbin warnings in logs
Vincent Petry [Tue, 25 Mar 2014 10:00:01 +0000 (11:00 +0100)]
Do not retrieve storage stats for trash bin
Vincent Petry [Thu, 26 Jun 2014 08:50:59 +0000 (10:50 +0200)]
Remove etag warning in trashbin
When previews are available, the etag attribute is used for the icon.
But when none is set, a warning is shown.
This fix uses the timestamp as a dummy etag.
Morris Jobke [Wed, 25 Jun 2014 09:03:29 +0000 (11:03 +0200)]
Merge pull request #9197 from owncloud/fix_dir_seperator_oc6
always use '/' as dir seperator
Bjoern Schiessle [Tue, 24 Jun 2014 16:45:22 +0000 (18:45 +0200)]
always use '/' as dir seperator
Frank Karlitschek [Tue, 24 Jun 2014 13:44:53 +0000 (09:44 -0400)]
6.0.4
Bjoern Schiessle [Mon, 23 Jun 2014 15:13:56 +0000 (17:13 +0200)]
always use a \OC\Files\View
Bjoern Schiessle [Mon, 23 Jun 2014 15:28:57 +0000 (17:28 +0200)]
always use oc filesystem for rename operation
Frank Karlitschek [Fri, 20 Jun 2014 20:56:37 +0000 (16:56 -0400)]
Merge pull request #9075 from owncloud/autosetup-trusteddomains
trusted domains shall not be ignored on autosetup
Arthur Schiwon [Fri, 20 Jun 2014 18:47:51 +0000 (20:47 +0200)]
Backport subset of #4179, re-established Oracle compatibility for LDAP
Vincent Petry [Wed, 26 Mar 2014 11:10:17 +0000 (12:10 +0100)]
Fix merging of external storage configurations
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.
Fixed merging logic to make sure that class, mount point and options are
the same before merging them.
Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
Backport of
e002b72 from master
Arthur Schiwon [Tue, 17 Jun 2014 20:58:08 +0000 (22:58 +0200)]
trusted domains shall not be ignored on autosetup
blizzz [Tue, 17 Jun 2014 08:04:57 +0000 (10:04 +0200)]
Merge pull request #9002 from owncloud/ldap_wizard_pagedsearch
LDAP Wizard: get correct total no of users, groups and complete list of groups on big setups
Frank Karlitschek [Tue, 17 Jun 2014 06:48:46 +0000 (08:48 +0200)]
6.0.4 beta 1
Arthur Schiwon [Thu, 12 Jun 2014 11:21:25 +0000 (13:21 +0200)]
remove unused vars; increase scrutinizer happiness
Arthur Schiwon [Thu, 12 Jun 2014 09:48:29 +0000 (11:48 +0200)]
simplify two methods a bit, because they are not used for group search anymore
Arthur Schiwon [Wed, 11 Jun 2014 20:36:40 +0000 (22:36 +0200)]
make all this work in an early configuration state in the wizard by marking the config active and ignoring the validation state.
Arthur Schiwon [Wed, 11 Jun 2014 19:38:16 +0000 (21:38 +0200)]
Wizard: get really all groups from LDAP by power of Paged Search
Arthur Schiwon [Wed, 11 Jun 2014 19:37:23 +0000 (21:37 +0200)]
fix PHPdoc
Arthur Schiwon [Wed, 11 Jun 2014 12:51:40 +0000 (14:51 +0200)]
consolidate requirement check
Arthur Schiwon [Wed, 11 Jun 2014 12:37:23 +0000 (14:37 +0200)]
LDAP Wizard: count users and groups with the power of paged search
Arthur Schiwon [Wed, 11 Jun 2014 12:33:11 +0000 (14:33 +0200)]
add method to count groups on LDAP
Arthur Schiwon [Wed, 11 Jun 2014 11:35:35 +0000 (13:35 +0200)]
fix PHPdoc
blizzz [Mon, 16 Jun 2014 15:42:46 +0000 (17:42 +0200)]
Merge pull request #8623 from owncloud/fix-8457
LDAP: fix possible infinite loop, that causes hanging wizard, fixes #8457
Lukas Reschke [Mon, 16 Jun 2014 14:20:21 +0000 (16:20 +0200)]
Merge pull request #9033 from owncloud/validate-dire
Add deprecation notice to load* functions
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