summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | PHPdoc fixes, no code changeArthur Schiwon2014-12-173-5/+7
| | |
| * | forgotten fileArthur Schiwon2014-12-171-0/+129
| | |
| * | add ldap:check-user to check user existance on the flyArthur Schiwon2014-12-175-28/+81
| | |
| * | LDAP User CleanupArthur Schiwon2014-12-1535-95/+1094
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | background job for user clean up adjust user backend for clean up register background job remove dead code dependency injection make Helper non-static for proper testing check whether it is OK to run clean up job. Do not forget to pass arguments. use correct method to get the config from server methods can be private, proper indirect testing is given no automatic user deletion make limit readable for test purposes make method less complex add first tests let preferences accept limit and offset for getUsersForValue DI via constructor does not work for background jobs after detecting, now we have retrieving deleted users and their details we need this method to be public for now finalize export method, add missing getter clean up namespaces and get rid of unnecessary files helper is not static anymore cleanup according to scrutinizer add cli tool to show deleted users uses are necessary after recent namespace change also remove user from mappings table on deletion add occ command to delete users fix use statement improve output big fixes / improvements PHP doc return true in userExists early for cleaning up deleted users bump version control state and interval with one config.php setting, now ldapUserCleanupInterval. 0 will disable it. enabled by default. improve doc rename cli method to be consistent with others introduce ldapUserCleanupInterval in sample config don't show last login as unix epoche start when no login happend less log output consistent namespace for OfflineUser rename GarbageCollector to DeletedUsersIndex and move it to user subdir fix unit tests add tests for deleteUser more test adjustements
* | | Merge pull request #12332 from owncloud/langbport2Morris Jobke2014-12-1930-18/+48
|\ \ \ | | | | | | | | more strings to backport
| * | | more strings to backportVolkan Gezer2014-11-2030-18/+48
| | | |
* | | | show spinner on file upload in IE8, 9Morris Jobke2014-12-191-0/+15
| | | |
* | | | Merge pull request #12798 from cyberb/stable7Jan-Christoph Borchardt2014-12-161-1/+0
|\ \ \ \ | |_|/ / |/| | | fixes #12434 (stable7)
| * | | fixes #12434Boris Rybalkin2014-12-111-1/+0
| | | |
* | | | Merge pull request #12825 from d1saster/stable7-fixpcreMorris Jobke2014-12-141-1/+1
|\ \ \ \ | | | | | | | | | | make regex in controllermethodreflector.php compatible with PCRE 6.x
| * | | | make regex in controllermethodreflector.php compatible with PCRE 6.xPhilipp Knechtges2014-12-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The syntax ?<...> seems to be only supported from PCRE 7.0 on. For backwards-compability ?P<...> is used.
* | | | | Merge pull request #12655 from owncloud/fix-appstore-linkMorris Jobke2014-12-131-1/+6
|\ \ \ \ \ | |/ / / / |/| | | | fix broken link on app management page for apps without ocsid
| * | | | fix broken link on app management page for apps without ocsid - fix #9574, ↵Morris Jobke2014-12-131-1/+6
| | | | | | | | | | | | | | | | | | | | fix #10461
* | | | | Merge pull request #12624 from nazar-pc/stable7Vincent Petry2014-12-123-8/+11
|\ \ \ \ \ | | | | | | | | | | | | Backport of #11524 into stable7
| * | | | | Merge pull request #11524 from nazar-pc/patch-1Vincent Petry2014-12-043-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | Page size calculation based on real page height
* | | | | | remove ugly hack and don't use OC\Preview\Image for tiffs and svgsGeorg Ehrke2014-12-122-11/+1
| | | | | |
* | | | | | Return real mime type on PROPFINDVincent Petry2014-12-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Return the real (insecure) mime type on PROPFIND
* | | | | | Ensure user mountpoints are setup when using getUserFolderRobin Appelman2014-12-121-0/+1
| | | | | |
* | | | | | Do not remove dir entry if it has the same name as the parentVincent Petry2014-12-111-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue when a subdir has the same name as its parent, it would get exluded from the list.
* | | | | | Merge pull request #12663 from zinks-/l10n-fr-backportMorris Jobke2014-12-1010-121/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | Patched french translation (backported from master)
| * | | | | | Patched french translation (backported from master)Thomas Imbreckx2014-12-0510-121/+121
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #12656 from owncloud/stable7-fix-12164Morris Jobke2014-12-101-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Wipe cache if there is no response from feed
| * | | | | | Wipe cache if there is no response from feedVictor Dubiniuk2014-12-061-0/+1
| |/ / / / /
* | | | | | Add js unit testRobin Appelman2014-12-101-7/+27
| | | | | |