summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 7.0.5 RC1Frank Karlitschek2015-02-061-2/+2
|
* Merge pull request #13927 from owncloud/fix_ghost_directoriesMorris Jobke2015-02-061-2/+9
|\ | | | | fix creation of ghost directories
| * for password protected link shares the password is stored in shareWith, so ↵Bjoern Schiessle2015-02-051-2/+9
| | | | | | | | we need to set this manually to null for the hooks
* | Merge pull request #13759 from owncloud/fix-12035Thomas Müller2015-02-051-1/+1
|\ \ | | | | | | fix LDAP update routine to OC 7
| * | fix update routineArthur Schiwon2015-01-291-1/+1
| | |
* | | Merge pull request #13888 from owncloud/upload_to_root_of_mountpoint_stable7Morris Jobke2015-02-042-0/+27
|\ \ \ | | | | | | | | detect root of mountpoint also if the trailing slash is missed
| * | | detect root of mountpoint also if the trailing slash is missedBjoern Schiessle2015-02-042-0/+27
| | |/ | |/|
* | | Merge pull request #13796 from owncloud/issue/13490-stable7-backportBjörn Schießle2015-02-042-20/+18
|\ \ \ | |/ / |/| | [stable7] use uid provided by setupfs hook to mount server2server shares
| * | use uid provided by setupfs hook to mount server2server sharesJoas Schilling2015-01-302-20/+18
| | | | | | | | | | | | | | | | | | otherwise mount will fail for public link shares backport of 66f0db30b2ba97cbe91031b42740dabddc659f0d
* | | Merge pull request #13880 from owncloud/backport-10398-stable7Morris Jobke2015-02-041-11/+17
|\ \ \ | | | | | | | | [backport #10398] Give a better error message for external shares with self-signed ssl cer...
| * | | Give a better error message for external shares with self-signed ssl ↵Robin Appelman2015-02-041-11/+17
|/ / / | | | | | | | | | certificates
* | | Merge pull request #13803 from owncloud/revert-close-cursor-stable7Thomas Müller2015-01-302-4/+0
|\ \ \ | | | | | | | | Revert "Close cursor early in calculateFolderSize" for now
| * | | Revert "Close cursor early in calculateFolderSize"Joas Schilling2015-01-302-4/+0
| |/ / | | | | | | | | | This reverts commit 234f33e01e630f763f34c51114d25986bae02b42.
* | | Merge pull request #13798 from owncloud/update-sabre-dav-stable7Morris Jobke2015-01-301-0/+0
|\ \ \ | |/ / |/| | | | | Update sabre dav to 1.8.12 on stable7
| * | Update sabre dav to 1.8.12 on stable7Joas Schilling2015-01-301-0/+0
|/ /
* / Close cursor early in calculateFolderSizeVincent Petry2015-01-292-0/+4
|/ | | | | 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
* Merge pull request #13470 from ↵Morris Jobke2015-01-232-12/+107
|\ | | | | | | | | owncloud/stable7-share-fixfindshareforuserwithmultiplegroups [stable7] Fix getItemSharedWithUser for groups
| * Fix getItemSharedWithUser for groupsVincent Petry2015-01-202-12/+107
| | | | | | | | | | | | | | | | 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
* | add config-option for an image's maximum filesize when generating previewsGeorg Ehrke2015-01-222-0/+19
| |
* | remove insane debug-log from OC_ImageGeorg Ehrke2015-01-221-1/+0
| |
* | Fix undefined offset 1 for wrong user mail addressMorris Jobke2015-01-222-10/+27
| | | | | | | | * fixes Undefined offset: 1 at lib/private/mail.php#143
* | Add unit testRobin Appelman2015-01-221-0/+1
| |
* | Remove duplicated slashes from the requested urlRobin Appelman2015-01-221-0/+2
| |
* | Merge pull request #13555 from owncloud/issue/13482-stable7Morris Jobke2015-01-211-0/+1
|\ \ | | | | | | Stable7 Backport Set the debugoutput channel to error_log instead of echoing it
| * | Set the debugoutput channel to error_log instead of echoing itJoas Schilling2015-01-211-0/+1
|/ /
* | this must be larger then (>), since buggy behaviour occurs when the ↵Arthur Schiwon2015-01-211-1/+1
| | | | | | | | parameter is a small number
* | Merge pull request #13422 from owncloud/user-mgnt-init-fixThomas Müller2015-01-192-5/+5
|\ \ | |/ |/| Increase initial user count to 50
| * Increase initial user count to 50Morris Jobke2015-01-162-5/+5
| | | | | | | | * fix initial user count if you have a big screen (or a portrait screen)
* | Note in config.sample.php that certain previews are not available in ms windowsCarla Schroder2015-01-171-1/+10
|/
* Merge pull request #13384 from owncloud/stable7-fix-13317-backportThomas Müller2015-01-152-3/+17
|\ | | | | Fix backport of #13317
| * Fix testRobin Appelman2015-01-151-0/+1
| |
| * php <5.4 style arrayRobin Appelman2015-01-151-2/+2
| |
| * Proper constant for stable7Robin Appelman2015-01-151-1/+1
| |
| * Add View::getMount() for stable7Robin Appelman2015-01-151-0/+13
|/
* Use source storage permissions when scanning shared storageVincent Petry2015-01-153-1/+47
|
* Return valid fileinfo objects for part filesRobin Appelman2015-01-152-0/+45
|
* drop useless "!!! No reuse of etag" - fixes #13187Morris Jobke2015-01-131-3/+0
| | | | Backport of 9b49b52fc6cd11615be86580c32e43a81d46772f from master
* fix retrieval of user groupsArthur Schiwon2015-01-132-2/+8
| | | | | Conflicts: apps/user_ldap/lib/connection.php
* Merge pull request #13186 from owncloud/no-session-for-formfactor-stable7Morris Jobke2015-01-091-22/+14
|\ | | | | no need to store the form factor in the session - it's computation is ra...
| * no need to store the form factor in the session - it's computation is rather ↵Thomas Müller2015-01-091-22/+14
| | | | | | | | | | | | | | cheep Conflicts: lib/private/template.php
* | replace outdated 'shared' people icon with regular share icon as fallbackJan-Christoph Borchardt2015-01-092-3/+4
| |
* | Merge pull request #12735 from owncloud/temp-handling-stable7Morris Jobke2015-01-088-120/+353
|\ \ | | | | | | [stable7] Cleanup handling of temporary files
| * | Use the TempManager to handle temporary filesRobin Appelman2015-01-083-120/+7
| | | | | | | | | | | | | | | Conflicts: lib/private/helper.php
| * | Add \OC\TempManager to handle creating and cleaning temporary filesRobin Appelman2015-01-085-0/+346
|/ / | | | | | | | | | | Conflicts: lib/private/server.php lib/public/iservercontainer.php
* | Fix source path when share is a mount pointVincent Petry2015-01-081-1/+3
| | | | | | | | | | | | | | | | | | Whenever an external storage mount point is shared directly, its path is empty which causes a leading slash to appear in the source path. This fix removes the bogus leading slash in such situation. Backport of 01c83158bb997a68736ef3dd548bcbc96e9cca94 from master
* | Prevent leaking db connection info in the stacktraceRobin Appelman2015-01-071-0/+10
| |
* | Check for version before mounting a public linkMorris Jobke2015-01-052-2/+3
| | | | | | | | | | | | * ownCloud 7.0.0 is needed - version of merge of server <-> server sharing - https://github.com/owncloud/core/pull/8399 * adjust error message
* | Added error check to lib/private/image.phpByron Marohn2015-01-021-0/+6
| | | | | | | | | | | | | | This checks that imagecreatetruecolor actually creates an image, rather than returning FALSE. Without this check, subsequent loop might create billions of ERROR-level log messages. Signed-off-by: Byron Marohn <combustible@live.com>
* | Merge pull request #12643 from owncloud/ldap-user-cleanup-stable7blizzz2014-12-1936-106/+1280
|\ \ | | | | | | LDAP User Cleanup - stable7
| * | and don't forget to adjust testsArthur Schiwon2014-12-181-21/+12
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 15:09:52 +0000