summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable5' into fixing-4866-stable5Thomas Müller2013-11-2270-354/+2648
|\
| * Fixed testTouch unit test to work with stable5Vincent Petry2013-11-221-5/+7
| | | | | | | | | | | | | | | | | | Calling getFileInfo() would trigger checkUpdate() and would return the real file mtime because the test value 500 was in the past. This fix makes this test work with the stable5 behavior. Removed "storage_mtime" references which don't exist in stable5.
| * Emulate touch() for backends that don't support itRobin Appelman2013-11-212-3/+37
| | | | | | | | Backport of 9738fae3cf1ad18593d21eb62e138e00c01f5f36
| * Merge pull request #5893 from owncloud/stable5-extstorage-smbfixesVincent Petry2013-11-193-3/+73
| |\ | | | | | | [stable5] External storage SMB fixes for stat and unlink backport
| | * Fixed SMB file deletion success detectionVincent Petry2013-11-152-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | Since unlink() smb4php doesn't return true on deletion success, we need to check whether the file was deleted to confirm success. Fixes #5866 Backport of eefd91355d54b7e49dd328cef9a9561ee51b0194
| | * Removing trailing dot in path that samba doesn't seem to likeVincent Petry2013-11-152-1/+47
| | | | | | | | | | | | | | | | | | | | | Fixes #5778 Added unit test for getId() and constructUrl() Backport of f66ec8a02271e73755cb965107eca60f027ffe78
| * | Merge pull request #5921 from owncloud/search_scrollto_stable5Morris Jobke2013-11-187-13/+109
| |\ \ | | | | | | | | backport search scrollto & filter to stable5
| | * | fixing js error in case the file name is a numberThomas Müller2013-11-181-1/+1
| | | |
| | * | backport search scrollto & filter to stable5Jörn Friedrich Dreyer2013-11-187-13/+109
| |/ /
| * | Merge pull request #5883 from owncloud/stable5-singledotdirsVincent Petry2013-11-154-5/+76
| |\ \ | | | | | | | | Stable5 single dot dirs
| | * | Added missing test with leading backslashVincent Petry2013-11-151-0/+2
| | | |
| | * | Files app backend now normalizes paths before rendering templatesVincent Petry2013-11-152-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before rendering breadcrumbs or the file list, the paths are now normalized. This prevents the UI to show "." breadcrumbs in case the path contains sections with "/./" Fixes #5848 Backport of 008c3b80d6cca6a15299afe01f150f075813df8c
| | * | Fixed normalizePath() to strip out single dot dirsVincent Petry2013-11-152-4/+71
| | |/ | | | | | | | | | | | | | | | Now removing "/./" and trailing "/." from the paths when normalizing. Backport of c06d8bb0071839480f9e458e58630ca0c205b9cb
| * | Merge pull request #5307 from nicokaiser/fixing-3694-stable5Frank Karlitschek2013-11-151-0/+2
| |\ \ | | |/ | |/| Fix OC_User::getDisplayName to persist between (browser) sessions. Fixes #3694
| | * Fix static function call. Sorry.Nico Kaiser2013-10-111-1/+1
| | |
| | * Fix OC_User::getDisplayName to persist between (browser) sessions. Fixes #3694Nico Kaiser2013-10-111-0/+2
| | |
| * | Merge pull request #5811 from owncloud/fixing-5808-stable5Thomas Müller2013-11-111-6/+6
| |\ \ | | | | | | | | fixing Fatal error: Call to a member function logicToPhysical() on a non-object
| | * | fixes #5808Thomas Müller2013-11-111-6/+6
| |/ /
| * | Merge pull request #5725 from owncloud/fix_enabling_apps_on_oracle_cornercaseThomas Müller2013-11-111-3/+23
| |\ \ | | | | | | | | fix enabling apps for oracle - cornercase
| | * | add missing argument $queryThomas Müller2013-11-081-1/+1
| | | |
| | * | use empty to check for null and ''Jörn Friedrich Dreyer2013-11-081-2/+2
| | | |
| | * | fix enabling apps for oracle cornercaseJörn Friedrich Dreyer2013-11-061-3/+23
| | | |
| * | | Merge pull request #5723 from owncloud/stable5-strayremembermecookiesfixOwen Winkler2013-11-071-0/+5
| |\ \ \ | | | | | | | | | | Now removing stray old cookies from 5.0.12
| | * | | Now removing stray old cookies from 5.0.12Vincent Petry2013-11-061-0/+5
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies from 5.0.12 seemed to have an extra slash in the path. Firefox doesn't allow to remove them if the trailing slash isn't there, thus making it impossible to logout correctly. This fix adds extra code to delete such stray cookies.
| * | | Merge pull request #5726 from owncloud/more_debug_output_stable5Morris Jobke2013-11-062-8/+21
| |\ \ \ | | |/ / | |/| | add debug output related to app enablement
| | * | add debug output related to app enablementJörn Friedrich Dreyer2013-11-062-8/+21
| |/ /
| * | let's increase the version number once moreFrank Karlitschek2013-11-051-1/+1
| | |
| * | Merge pull request #5704 from owncloud/fixing-5663-stable5Frank Karlitschek2013-11-051-4/+4
| |\ \ | | | | | | | | we create the cookies for the url path \OC::$WEBROOT - as a result we sh...
| | * | we create the cookies for the url path \OC::$WEBROOT - as a result we shall ↵Thomas Müller2013-11-051-4/+4
| |/ / | | | | | | | | | | | | | | | 'remove' them with the same path unsetMagicInCookie() is supposed to be static
| * | 5.0.13v5.0.13Frank Karlitschek2013-11-051-2/+2
| | |
| * | When updating an appstore app, execute a database updateBart Visscher2013-11-011-1/+5
| | | | | | | | | | | | See #5202
| * | 5.0.13 RC1Frank Karlitschek2013-11-011-2/+2
| | |
| * | Merge pull request #5583 from frisco82/backportCookieChangesThomas Müller2013-10-311-5/+5
| |\ \ | | | | | | | | Backport of #3985 (Invalid remember me token)
| | * | Fix logout issue with tokensRamiro Aparicio2013-10-281-5/+5
| | | |
| * | | Merge pull request #5640 from owncloud/backport_executeaudited_stable5Thomas Müller2013-10-312-77/+229
| |\ \ \ | | | | | | | | | | Backport executeaudited stable5
| | * | | adding second argument to DatabaseExceptionThomas Müller2013-10-311-6/+17
| | | | | | | | | | | | | | | | | | | | | | | | | updated some PHPDoc comments fixing undefined variable in line 789 - actually unrelated but well ....
| | * | | remove leftover execute() and unused variablesJörn Friedrich Dreyer2013-10-311-8/+7
| | | | |
| | * | | use executeAudited() for all cache queriesJörn Friedrich Dreyer2013-10-301-74/+142
| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/files/cache/cache.php
| | * | | backport executeAudited()Jörn Friedrich Dreyer2013-10-301-1/+75
| | | | |
| * | | | Merge pull request #5647 from owncloud/fix4390_stable5Thomas Müller2013-10-313-17/+28
| |\ \ \ \ | | | | | | | | | | | | Fix4390 stable5
| | * | | | use closest instead of parentJörn Friedrich Dreyer2013-10-311-1/+1
| | | | | |
| | * | | | extend unit test to directories starting or ending in whitespaceJörn Friedrich Dreyer2013-10-311-15/+26
| | | | | |
| | * | | | disable MDB2_PORTABILITY_RTRIMJörn Friedrich Dreyer2013-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes dnd into folders ending in whitespace on oracle unnecessary portability option because only affects fixed length character columns. luckily we dont have that kind of columns: the text datatype is transformed into varchar by MDB2
| | * | | | allow dnd into folders starting with whitespaceJörn Friedrich Dreyer2013-10-311-1/+1
| | |/ / /
| * | | | Merge pull request #5574 from owncloud/fixing-5271-stable5Thomas Müller2013-10-311-0/+2
| |\ \ \ \ | | | | | | | | | | | | we should check if a user is logged in before we check for admin privile...
| | * | | | call \OC_Util::checkLoggedIn() on checkSubAdminUser() as wellThomas Müller2013-10-301-0/+1
| | | | | |
| | * | | | we should check if a user is logged in before we check for admin privilegeThomas Müller2013-10-281-0/+1
| | | | | |
| * | | | | Merge pull request #5579 from owncloud/backport_5496Thomas Müller2013-10-311-0/+18
| |\ \ \ \ \ | | | | | | | | | | | | | | backport of #5496, fixes #5421 for stable5
| | * | | | | backport of #5496, fixes #5421 for stable5Jörn Friedrich Dreyer2013-10-281-0/+18
| | |/ / / /
| * | | | | Merge pull request #5327 from owncloud/backport-4867-stable5Thomas Müller2013-10-313-9/+82
| |\ \ \ \ \ | | | | | | | | | | | | | | [stable5] Adding detection of aborted uploads for chunked uploads