summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'stable5' into fixing-4866-stable5Thomas Müller2013-11-2225-157/+661
|\
| * Emulate touch() for backends that don't support itRobin Appelman2013-11-211-1/+5
| | | | | | | | Backport of 9738fae3cf1ad18593d21eb62e138e00c01f5f36
| * backport search scrollto & filter to stable5Jörn Friedrich Dreyer2013-11-182-2/+4
| |
| * Merge pull request #5883 from owncloud/stable5-singledotdirsVincent Petry2013-11-151-3/+17
| |\ | | | | | | Stable5 single dot dirs
| | * Fixed normalizePath() to strip out single dot dirsVincent Petry2013-11-151-3/+17
| | | | | | | | | | | | | | | | | | 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
| | |
| * | 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.
| * / / 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
| | |
| * | 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-311-1/+1
| |\ \ \ \ | | | | | | | | | | | | Fix4390 stable5
| | * | | | 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
| * | | | 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
| | * | | | | fixes #5367Thomas Müller2013-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/file.php
| | * | | | | fixes #5367Thomas Müller2013-10-281-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/file.php
| | * | | | | Merge branch 'stable5' into backport-4867-stable5Thomas Müller2013-10-287-9/+33
| | |\| | | |
| | * | | | | minimize diff for easier reviewThomas Müller2013-10-141-32/+35
| | | | | | |
| | * | | | | adding detection of aborted uploadsThomas Müller2013-10-141-43/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php
| | * | | | | returning the number of stored bytes in store() and adding cleanup() methodThomas Müller2013-10-141-1/+22
| | | | | | |
| | * | | | | adding size() to the file cacheThomas Müller2013-10-141-0/+18
| | | |_|_|/ | | |/| | |
| * | | | | Merge pull request #5630 from owncloud/backport_home_storage_stable5Thomas Müller2013-10-313-1/+49
| |\ \ \ \ \ | | | | | | | | | | | | | | backport home storage to stable5
| | * | | | | backport home storage to stable5Jörn Friedrich Dreyer2013-10-303-1/+49
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #5487 from ↵Frank Karlitschek2013-10-301-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/backport_search_in_shared_files_to_stable5 backport search in shared files to stable5
| | * | | | | backport search in shared files to stable5Jörn Friedrich Dreyer2013-10-231-3/+3
| | | | | | |
| * | | | | | Merge pull request #5613 from owncloud/upload_to_sharedJörn Friedrich Dreyer2013-10-301-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | fix check if we upload to /Shared
| | * | | | | fix check if we upload to /SharedBjoern Schiessle2013-10-291-1/+1
| | | | | | |
| * | | | | | Merge pull request #5513 from owncloud/fix_file_cache_updaterBjörn Schießle2013-10-292-12/+40
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | Fix file cache updater