]>
source.dussan.org Git - nextcloud-server.git/log
Jörn Friedrich Dreyer [Mon, 13 Oct 2014 15:49:40 +0000 (17:49 +0200)]
fix flickering users
Arthur Schiwon [Fri, 5 Sep 2014 08:35:24 +0000 (10:35 +0200)]
no need to load display names
Jörn Friedrich Dreyer [Thu, 21 Aug 2014 13:11:21 +0000 (15:11 +0200)]
fix deletion of shares
Jörn Friedrich Dreyer [Thu, 21 Aug 2014 12:48:45 +0000 (14:48 +0200)]
replace chosen with select2 to provide ajaxified user and group selection for files_external, fixes #7499
Jörn Friedrich Dreyer [Thu, 8 May 2014 13:23:06 +0000 (15:23 +0200)]
add select2 to app specific thirdparty
Lukas Reschke [Wed, 17 Sep 2014 15:12:06 +0000 (17:12 +0200)]
force loading of encryption app
Vincent Petry [Wed, 8 Oct 2014 13:09:02 +0000 (15:09 +0200)]
Prevent button click when enter key is pressed in LDAP wizard
Pressing enter in the LDAP wizard will trigger a click on the first
button. In the main page it would trigger the delete dialog, which is
quite inconvenient.
Added a type attribute to suppress this behavior.
Backport of
bb424802c8f6e8fd0e7fbe28e000400a5b0660f3 from master
Robin Appelman [Wed, 24 Sep 2014 13:48:54 +0000 (15:48 +0200)]
Show a proper error message when trying to scan the filesystem for a non existing user
Backport of
e8280c80da52399594ba116ef78bddf16b9e7f25 from master
Robin Appelman [Wed, 24 Sep 2014 13:44:56 +0000 (15:44 +0200)]
Don't keep the full info of all children in memory
Backport of
f88021dbbc3b53e4a1460a79185835770514722e from master
Arthur Schiwon [Tue, 19 Aug 2014 16:01:58 +0000 (18:01 +0200)]
Backport of #10527
properly cancel a Paginated Results operation in order to avoid protocol errors, fixes #10526
abandon ongoing paged search before starting a new one
abandond paged search only if PHP supports them
init a new paged search on read operations to satisfy OpenLDAP
make scrutinizer happy, very minor changes
Conflicts:
apps/user_ldap/lib/access.php
apps/user_ldap/lib/ildapwrapper.php
Lukas Reschke [Fri, 3 Oct 2014 13:19:59 +0000 (15:19 +0200)]
Merge pull request #8307 from owncloud/case_insensitive_search_oracle_stable6
on oracle use regex_like to make filename search case insensitive
Lukas Reschke [Wed, 1 Oct 2014 08:42:20 +0000 (10:42 +0200)]
Merge pull request #11153 from owncloud/parallel-upload-stable6
close the session for all DAV calls right after authentication - no need...
Jörn Friedrich Dreyer [Tue, 22 Apr 2014 18:40:18 +0000 (20:40 +0200)]
fix case insensitive search on oracle and postgresql
on oracle use regex_like
on postgres use ILIKE
add unit test to check case insensitivity
Lukas Reschke [Wed, 24 Sep 2014 19:16:14 +0000 (21:16 +0200)]
Clarify possible preview providers for type Office
a
Conflicts:
lib/private/preview.php
Morris Jobke [Tue, 23 Sep 2014 21:54:08 +0000 (23:54 +0200)]
Merge pull request #11246 from owncloud/backport-11211-stable6
Add a configuration switch for enabled preview mimetypes
Lukas Reschke [Tue, 23 Sep 2014 12:49:53 +0000 (14:49 +0200)]
Merge branch 'stable6' into backport-11211-stable6
Conflicts:
config/config.sample.php
Vincent Petry [Thu, 18 Sep 2014 17:21:04 +0000 (19:21 +0200)]
Reenable file proxy when renaming between mount points
When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.
In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.
Victor Dubiniuk [Mon, 22 Sep 2014 20:27:41 +0000 (23:27 +0300)]
Use non-empty defaults
Bjoern Schiessle [Mon, 22 Sep 2014 13:04:55 +0000 (15:04 +0200)]
first check if a private key exists, if not it is always a recovery szenario
Lukas Reschke [Tue, 23 Sep 2014 08:53:34 +0000 (10:53 +0200)]
Add a configuration switch for enabled preview mimetypes
Backport of https://github.com/owncloud/core/pull/11211 to stable6
Vincent Petry [Fri, 19 Sep 2014 17:01:02 +0000 (19:01 +0200)]
Added extra check to avoid deleting key folders
Whenever a delete operation is called twice in a row, it could happen
that the first call already deleted the file.
The second call would return an empty $ownerPath because the file does
not exist. That empty $ownerPath would run the key deletion operation on
the wrong path.
This fix adds checks in many places to make sure we don't use $ownerPath
when it's empty or null.
Backport of
8aca127e52f965871bea82cb27c6ea103baf34bb from master
Lukas Reschke [Mon, 22 Sep 2014 13:11:16 +0000 (15:11 +0200)]
Merge pull request #11207 from owncloud/enc_create_backup_on_recovery_oc6
create backup from all keys before recovery (oc6 backport)
Bjoern Schiessle [Tue, 16 Sep 2014 13:16:27 +0000 (15:16 +0200)]
create backup from all keys before recovery
Thomas Müller [Thu, 18 Sep 2014 11:21:08 +0000 (13:21 +0200)]
use session_write_close() because the Session class has no close() yet in this version
Thomas Müller [Mon, 10 Mar 2014 13:40:36 +0000 (14:40 +0100)]
close the session for all DAV calls right after authentication - no need to write to the session afterwards
Lukas Reschke [Tue, 16 Sep 2014 14:03:30 +0000 (16:03 +0200)]
Revert "Reword the description"
This reverts commit
16c5925155bfd6c7cc35745b233b0739fb513f51 .
Lukas Reschke [Tue, 16 Sep 2014 13:51:48 +0000 (15:51 +0200)]
Reword the description
The old one was just horrible wrong.
Conflicts:
config/config.sample.php
Thomas Müller [Fri, 12 Sep 2014 09:30:33 +0000 (11:30 +0200)]
Merge pull request #11025 from owncloud/nojavascript
introduce no-javascript message, manual backport of #6202 and #10944
Jan-Christoph Borchardt [Thu, 11 Sep 2014 14:09:36 +0000 (16:09 +0200)]
introduce no-javascript message, manual backport of #6202 and #10944, fix #10841
tomneedham [Tue, 18 Feb 2014 09:50:46 +0000 (09:50 +0000)]
Add displayname for admins
Vincent Petry [Wed, 3 Sep 2014 15:15:59 +0000 (17:15 +0200)]
Merge pull request #10250 from owncloud/block-folder-upload-stable6
Prevent folder upload causing unexpected behavior
Thomas Müller [Wed, 3 Sep 2014 10:46:12 +0000 (12:46 +0200)]
Merge pull request #10645 from owncloud/backport_7728
Backport 7728
Thomas Müller [Wed, 3 Sep 2014 09:06:02 +0000 (11:06 +0200)]
Merge pull request #10774 from owncloud/backport-getUserFolder
Add optional user ID parameter for getUseFolder
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
Thomas Müller [Mon, 17 Mar 2014 07:40:59 +0000 (08:40 +0100)]
unit tests for specific image type output added
Georg Ehrke [Tue, 26 Aug 2014 17:39:30 +0000 (19:39 +0200)]
Georg Ehrke [Fri, 14 Mar 2014 17:19:16 +0000 (18:19 +0100)]
OC_Image::_output() - throw exception instead of falling back to png
Georg Ehrke [Fri, 14 Mar 2014 17:12:33 +0000 (18:12 +0100)]
remove image/pjpeg from OC_Image::_output
Georg Ehrke [Fri, 14 Mar 2014 10:17:20 +0000 (11:17 +0100)]
don't change mimetype of whole image object
Georg Ehrke [Fri, 14 Mar 2014 10:14:09 +0000 (11:14 +0100)]
always output a png
Georg Ehrke [Fri, 14 Mar 2014 10:13:45 +0000 (11:13 +0100)]
make it possible to influence output type of \OC_Image
Conflicts:
lib/private/image.php
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
Robin Appelman [Thu, 7 Aug 2014 13:43:38 +0000 (15:43 +0200)]
Prevent folder upload causing unexpected behavior
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...