]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Mon, 13 Apr 2015 06:50:22 +0000 (08:50 +0200)]
Merge pull request #15559 from owncloud/backport-15541-stable7
[stable7] Add "Reply-To" support for sharing notifications
Lukas Reschke [Sun, 12 Apr 2015 20:54:29 +0000 (22:54 +0200)]
Add "Reply-To" support for sharing notifications
Very hacky backport of https://github.com/owncloud/core/pull/15541 - I changed the code path to use OC_Mail instead the OCP pendant since I didn't want to modify the public API. (OCP\Util::sendMail() is anyways deprecated with 8.1)
Morris Jobke [Fri, 10 Apr 2015 12:23:38 +0000 (14:23 +0200)]
Merge pull request #15435 from owncloud/dont_return_empty_groups
don't return null for not existing group id's
Jörn Friedrich Dreyer [Tue, 7 Apr 2015 11:47:10 +0000 (13:47 +0200)]
don't return null for not existing group id's
Thomas Müller [Thu, 2 Apr 2015 07:22:01 +0000 (09:22 +0200)]
Merge pull request #15370 from owncloud/stable7-backport-15353
Cron has to be executed with the correct user - fixes 13912 and others
Thomas Müller [Wed, 1 Apr 2015 08:31:48 +0000 (10:31 +0200)]
Cron has to be executed with the correct user - fixes 13912 and others
Morris Jobke [Fri, 27 Mar 2015 08:56:46 +0000 (09:56 +0100)]
Merge pull request #15251 from owncloud/use_default_share_folder_oc7
always fall back to default share folder
Lukas Reschke [Thu, 26 Mar 2015 22:00:33 +0000 (23:00 +0100)]
Merge pull request #14498 from owncloud/kill-substr-mssql-stable7
[stable7] Remove hacky Substring support for MSSQL
Bjoern Schiessle [Thu, 26 Mar 2015 20:56:44 +0000 (21:56 +0100)]
always fall back to default share folder
Morris Jobke [Thu, 26 Mar 2015 21:24:42 +0000 (22:24 +0100)]
Merge pull request #15072 from owncloud/fix_group_share
also call generateTarget for group shares
Morris Jobke [Thu, 26 Mar 2015 19:14:00 +0000 (20:14 +0100)]
Merge pull request #14861 from owncloud/stable7-fix-sizepropagationwithshare
[stable7] Fix size propagation over shared storage boundary
Thomas Müller [Tue, 24 Mar 2015 19:22:30 +0000 (20:22 +0100)]
Merge pull request #15161 from owncloud/stable7-fixcronconfig
[stable7] Fix config API usage in cron.php
Morris Jobke [Tue, 24 Mar 2015 19:11:34 +0000 (20:11 +0100)]
Merge pull request #14889 from owncloud/backport-14849-stable7
[stable7] support paged results against 389ds.
Vincent Petry [Tue, 24 Mar 2015 17:19:43 +0000 (18:19 +0100)]
Fix config API usage in cron.php
Morris Jobke [Tue, 24 Mar 2015 10:12:16 +0000 (11:12 +0100)]
Merge pull request #15141 from owncloud/backport-15123-stable7
[backport] [stable7] offset needs to be considered in computed limit
Arthur Schiwon [Mon, 23 Mar 2015 15:51:40 +0000 (16:51 +0100)]
offset needs to be considered in computed limit
Bjoern Schiessle [Fri, 20 Mar 2015 14:51:25 +0000 (15:51 +0100)]
also call generateTarget for group share to add the correct prefix if share_folder is defined in config.php
Thomas Müller [Mon, 16 Mar 2015 08:44:52 +0000 (09:44 +0100)]
Merge pull request #14902 from owncloud/tempmanager-fix-backport
Check directory handle before we use it
Robin McCorkell [Sun, 15 Mar 2015 18:28:01 +0000 (18:28 +0000)]
Check directory handle before we use it
Arthur Schiwon [Thu, 12 Mar 2015 21:47:20 +0000 (22:47 +0100)]
support paged results against 389ds.
Robin Appelman [Tue, 2 Dec 2014 15:39:03 +0000 (16:39 +0100)]
also clear statcache in mapped local
Robin Appelman [Fri, 5 Sep 2014 10:05:04 +0000 (12:05 +0200)]
Clear statcache before getting the mtime from local storage backends
Vincent Petry [Fri, 13 Mar 2015 10:36:31 +0000 (11:36 +0100)]
Uglify unit test to make them work on stable7
Vincent Petry [Mon, 9 Mar 2015 11:41:29 +0000 (12:41 +0100)]
Add unit test for size propagation across share boundaries
Vincent Petry [Thu, 5 Mar 2015 21:23:47 +0000 (22:23 +0100)]
Fix size propagation over shared storage boundary
Thomas Müller [Fri, 13 Mar 2015 08:25:18 +0000 (09:25 +0100)]
Merge pull request #14846 from owncloud/fix-14843-stable7
cron shall not operate in case we are in maintenance mode - fixes #14843
Thomas Müller [Thu, 12 Mar 2015 20:03:26 +0000 (21:03 +0100)]
cron shall not operate in case we are in maintenance mode - fixes #14843
Morris Jobke [Wed, 11 Mar 2015 19:16:01 +0000 (20:16 +0100)]
Merge pull request #14637 from owncloud/backport-13341
[Stable7] Read version and product name from update template
Morris Jobke [Wed, 11 Mar 2015 16:55:00 +0000 (17:55 +0100)]
Merge pull request #14182 from RealRancor/update_office_preview
[stable7] Fix libre/openoffice preview on multi-user instances
Morris Jobke [Mon, 9 Mar 2015 07:15:18 +0000 (08:15 +0100)]
Merge pull request #14707 from owncloud/ldap-reset-paged-search-on-null-limit-stable7
LDAP: reset paged search on null limit [stable7]
Arthur Schiwon [Thu, 5 Mar 2015 12:15:21 +0000 (13:15 +0100)]
set up paged search when limit is 0
Frank Karlitschek [Mon, 2 Mar 2015 21:45:17 +0000 (22:45 +0100)]
bump release
Frank Karlitschek [Wed, 4 Mar 2015 13:54:56 +0000 (08:54 -0500)]
Merge pull request #14688 from owncloud/stable7-trashbin-selected-delete
[stable7] Fix deleting selected files in the trashbin
Robin Appelman [Mon, 8 Dec 2014 14:16:15 +0000 (15:16 +0100)]
Fix deleting selected files in the trashbin
Morris Jobke [Mon, 2 Mar 2015 15:10:49 +0000 (16:10 +0100)]
Merge pull request #14642 from owncloud/issue/13751-only-variables-passed-by-reference
[Stable7] Fix "Only variables should be passed by reference" in stable7 template
Joas Schilling [Mon, 2 Mar 2015 13:29:41 +0000 (14:29 +0100)]
Fix "Only variables should be passed by reference" in stable7 template
Vincent Petry [Wed, 14 Jan 2015 10:31:42 +0000 (11:31 +0100)]
Read version and product name from update template
During upgrade, the config settings aren't always available due to
base.php changes. This fix makes the update info page read the product
name and version from the update template, which already had them.
Lukas Reschke [Wed, 25 Feb 2015 13:08:44 +0000 (14:08 +0100)]
Remove hacky Substring support for MSSQL
Substring() is not required for the core functionality and this allows us to get rid of a huge hack...
Thomas Müller [Mon, 23 Feb 2015 14:12:57 +0000 (15:12 +0100)]
Merge pull request #14425 from owncloud/backport-12313
[stable7] The class name is Movie NOT Movies
Olivier Paroz [Fri, 21 Nov 2014 16:12:11 +0000 (17:12 +0100)]
The class name is Movie NOT Movies
Conflicts:
config/config.sample.php
lib/private/preview.php
Frank Karlitschek [Mon, 16 Feb 2015 03:56:33 +0000 (04:56 +0100)]
7.0.5
Lukas Reschke [Tue, 17 Feb 2015 13:48:09 +0000 (14:48 +0100)]
Merge pull request #14040 from owncloud/stable7-app-upgrade-order
[Stable7] app upgrade order fix
Thomas Müller [Tue, 17 Feb 2015 13:08:45 +0000 (14:08 +0100)]
Merge pull request #12327 from owncloud/stable7l10nbport
backport some strings to stable7
Thomas Müller [Mon, 16 Feb 2015 18:44:07 +0000 (19:44 +0100)]
Merge pull request #14254 from owncloud/console-execution-time-stable7
[backport-14243-stable7] console commands shall not be limited with respect to execution time
Thomas Müller [Mon, 16 Feb 2015 08:16:32 +0000 (09:16 +0100)]
console commands shall not be limited with respect to execution time - fixes #14156
Lukas Reschke [Mon, 16 Feb 2015 13:41:52 +0000 (14:41 +0100)]
Merge pull request #13988 from owncloud/group-share-collition-wrong-type-in-post-hook-stable7
[stable7] Do not overwrite the shareType so the post hook is still correct
RealRancor [Thu, 12 Feb 2015 21:00:24 +0000 (22:00 +0100)]
Removed anchor in config.sample.php
RealRancor [Thu, 12 Feb 2015 22:15:28 +0000 (23:15 +0100)]
Fix libre/openoffice preview on multi-user instances
Jörn Friedrich Dreyer [Thu, 12 Feb 2015 16:07:34 +0000 (17:07 +0100)]
Merge pull request #14147 from owncloud/no-whitespace-from-themes-stable7
catch any whitespaces which might get written to the output buffer while...
Thomas Müller [Thu, 12 Feb 2015 10:20:38 +0000 (11:20 +0100)]
catch any whitespaces which might get written to the output buffer while loading a theme
Thomas Müller [Wed, 11 Feb 2015 20:17:59 +0000 (21:17 +0100)]
Merge pull request #14078 from owncloud/stable7-preview-hint
Add hint for troubleshooting MS Word previews
RealRancor [Tue, 10 Feb 2015 20:20:05 +0000 (21:20 +0100)]
Add hint for troubleshooting MS Word previews
Vincent Petry [Thu, 5 Feb 2015 17:44:44 +0000 (18:44 +0100)]
Fix "other" app update stack
Arthur Schiwon [Tue, 3 Feb 2015 18:02:25 +0000 (19:02 +0100)]
on ownCloud upgrade: upgrade all apps in order, load important ones
Joas Schilling [Mon, 9 Feb 2015 12:12:34 +0000 (13:12 +0100)]
Add a test for the post_shared hook shareType
Conflicts:
tests/lib/share/share.php
Joas Schilling [Mon, 9 Feb 2015 11:59:29 +0000 (12:59 +0100)]
Do not overwrite the shareType so the post hook is still correct
Conflicts:
lib/private/share/share.php
RealRancor [Sat, 7 Feb 2015 13:01:38 +0000 (14:01 +0100)]
external user app: Add note to enable it first
Lukas Reschke [Fri, 6 Feb 2015 14:09:31 +0000 (15:09 +0100)]
Normalize before processing
Frank Karlitschek [Fri, 6 Feb 2015 01:46:00 +0000 (02:46 +0100)]
7.0.5 RC1
Morris Jobke [Thu, 5 Feb 2015 23:07:43 +0000 (00:07 +0100)]
Merge pull request #13927 from owncloud/fix_ghost_directories
fix creation of ghost directories
Bjoern Schiessle [Thu, 5 Feb 2015 16:11:27 +0000 (17:11 +0100)]
for password protected link shares the password is stored in shareWith, so we need to set this manually to null for the hooks
Thomas Müller [Thu, 5 Feb 2015 16:05:32 +0000 (17:05 +0100)]
Merge pull request #13759 from owncloud/fix-12035
fix LDAP update routine to OC 7
Morris Jobke [Wed, 4 Feb 2015 15:21:34 +0000 (16:21 +0100)]
Merge pull request #13888 from owncloud/upload_to_root_of_mountpoint_stable7
detect root of mountpoint also if the trailing slash is missed
Björn Schießle [Wed, 4 Feb 2015 13:59:44 +0000 (14:59 +0100)]
Merge pull request #13796 from owncloud/issue/13490-stable7-backport
[stable7] use uid provided by setupfs hook to mount server2server shares
Bjoern Schiessle [Wed, 4 Feb 2015 11:07:16 +0000 (12:07 +0100)]
detect root of mountpoint also if the trailing slash is missed
Morris Jobke [Wed, 4 Feb 2015 13:09:25 +0000 (14:09 +0100)]
Merge pull request #13880 from owncloud/backport-10398-stable7
[backport #10398] Give a better error message for external shares with self-signed ssl cer...
Robin Appelman [Wed, 13 Aug 2014 14:46:04 +0000 (16:46 +0200)]
Give a better error message for external shares with self-signed ssl certificates
Thomas Müller [Fri, 30 Jan 2015 22:23:44 +0000 (23:23 +0100)]
Merge pull request #13803 from owncloud/revert-close-cursor-stable7
Revert "Close cursor early in calculateFolderSize" for now
Morris Jobke [Fri, 30 Jan 2015 14:51:27 +0000 (15:51 +0100)]
Merge pull request #13798 from owncloud/update-sabre-dav-stable7
Update sabre dav to 1.8.12 on stable7
Joas Schilling [Fri, 30 Jan 2015 14:35:54 +0000 (15:35 +0100)]
Revert "Close cursor early in calculateFolderSize"
This reverts commit
234f33e01e630f763f34c51114d25986bae02b42 .
Joas Schilling [Fri, 30 Jan 2015 13:43:41 +0000 (14:43 +0100)]
Update sabre dav to 1.8.12 on stable7
Joas Schilling [Fri, 30 Jan 2015 11:50:43 +0000 (12:50 +0100)]
use uid provided by setupfs hook to mount server2server shares
otherwise mount will fail for public link shares
backport of
66f0db30b2ba97cbe91031b42740dabddc659f0d
Vincent Petry [Fri, 28 Nov 2014 08:35:31 +0000 (09:35 +0100)]
Close cursor early in calculateFolderSize
This method triggers additional queries in $this->update() so to avoid
potential database locks or delays, we close the cursor as soon as it is not needed any more
Arthur Schiwon [Thu, 29 Jan 2015 11:51:12 +0000 (12:51 +0100)]
fix update routine
Morris Jobke [Fri, 23 Jan 2015 11:59:39 +0000 (12:59 +0100)]
Merge pull request #13470 from owncloud/stable7-share-fixfindshareforuserwithmultiplegroups
[stable7] Fix getItemSharedWithUser for groups
Georg Ehrke [Sun, 18 Jan 2015 23:22:55 +0000 (00:22 +0100)]
add config-option for an image's maximum filesize when generating previews
Georg Ehrke [Thu, 22 Jan 2015 19:17:25 +0000 (20:17 +0100)]
remove insane debug-log from OC_Image
Morris Jobke [Thu, 22 Jan 2015 14:17:29 +0000 (15:17 +0100)]
Fix undefined offset 1 for wrong user mail address
* fixes Undefined offset: 1 at lib/private/mail.php#143
Robin Appelman [Wed, 21 Jan 2015 16:18:47 +0000 (17:18 +0100)]
Add unit test
Robin Appelman [Wed, 21 Jan 2015 14:04:18 +0000 (15:04 +0100)]
Remove duplicated slashes from the requested url
Morris Jobke [Wed, 21 Jan 2015 15:31:04 +0000 (16:31 +0100)]
Merge pull request #13555 from owncloud/issue/13482-stable7
Stable7 Backport Set the debugoutput channel to error_log instead of echoing it
Joas Schilling [Wed, 21 Jan 2015 13:31:24 +0000 (14:31 +0100)]
Set the debugoutput channel to error_log instead of echoing it
Arthur Schiwon [Tue, 20 Jan 2015 16:50:53 +0000 (17:50 +0100)]
this must be larger then (>), since buggy behaviour occurs when the parameter is a small number
Vincent Petry [Fri, 16 Jan 2015 17:11:13 +0000 (18:11 +0100)]
Fix getItemSharedWithUser for groups
Fixed SQL query for whenever a user has more than one group.
Added missing $owner where clause for group lookup.
Added unit tests for the group cases.
Backport of
40931a8b0d5d10c0f711756a4e8a423ff055621e from master
Thomas Müller [Mon, 19 Jan 2015 14:08:16 +0000 (15:08 +0100)]
Merge pull request #13422 from owncloud/user-mgnt-init-fix
Increase initial user count to 50
Carla Schroder [Wed, 14 Jan 2015 17:38:43 +0000 (09:38 -0800)]
Note in config.sample.php that certain previews are not available in ms windows
Morris Jobke [Fri, 16 Jan 2015 17:04:29 +0000 (18:04 +0100)]
Increase initial user count to 50
* fix initial user count if you have a big screen (or a portrait screen)
Thomas Müller [Thu, 15 Jan 2015 16:27:09 +0000 (17:27 +0100)]
Merge pull request #13384 from owncloud/stable7-fix-13317-backport
Fix backport of #13317
Robin Appelman [Thu, 15 Jan 2015 13:24:54 +0000 (14:24 +0100)]
Fix test
Robin Appelman [Thu, 15 Jan 2015 13:02:36 +0000 (14:02 +0100)]
php <5.4 style array
Robin Appelman [Thu, 15 Jan 2015 13:02:11 +0000 (14:02 +0100)]
Proper constant for stable7
Robin Appelman [Thu, 15 Jan 2015 13:01:52 +0000 (14:01 +0100)]
Add View::getMount() for stable7
Vincent Petry [Wed, 14 Jan 2015 11:35:24 +0000 (12:35 +0100)]
Use source storage permissions when scanning shared storage
Robin Appelman [Tue, 13 Jan 2015 12:59:28 +0000 (13:59 +0100)]
Return valid fileinfo objects for part files
Morris Jobke [Tue, 13 Jan 2015 08:54:48 +0000 (09:54 +0100)]
drop useless "!!! No reuse of etag" - fixes #13187
Backport of
9b49b52fc6cd11615be86580c32e43a81d46772f from master
Arthur Schiwon [Mon, 12 Jan 2015 15:25:11 +0000 (16:25 +0100)]
fix retrieval of user groups
Conflicts:
apps/user_ldap/lib/connection.php
Morris Jobke [Fri, 9 Jan 2015 17:19:26 +0000 (18:19 +0100)]
Merge pull request #13186 from owncloud/no-session-for-formfactor-stable7
no need to store the form factor in the session - it's computation is ra...
Jan-Christoph Borchardt [Fri, 9 Jan 2015 15:18:42 +0000 (16:18 +0100)]
replace outdated 'shared' people icon with regular share icon as fallback
Thomas Müller [Wed, 12 Nov 2014 15:16:02 +0000 (16:16 +0100)]
no need to store the form factor in the session - it's computation is rather cheep
Conflicts:
lib/private/template.php
Morris Jobke [Thu, 8 Jan 2015 17:35:00 +0000 (18:35 +0100)]
Merge pull request #12735 from owncloud/temp-handling-stable7
[stable7] Cleanup handling of temporary files