summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into files_encryptionBjörn Schießle2013-05-212-0/+33
|\
| * Remove debug outputThomas Tanghus2013-05-201-1/+0
| * Add rename() method to OC_VCategories.Thomas Tanghus2013-05-201-0/+32
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-201-0/+2
* | Merge branch 'master' into files_encryptionFlorin Peter2013-05-206-10/+82
|\|
| * Merge pull request #3421 from owncloud/pre_login_passwordMichael Gapczynski2013-05-191-2/+2
| |\
| | * Add password to pre_loginLukas Reschke2013-05-191-2/+2
| * | Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_a...FlorinPeter2013-05-171-4/+6
| |\ \
| | * | only connect share hooks if installation OC is installedFlorin Peter2013-05-171-4/+6
| | * | revert changesFlorin Peter2013-05-171-28/+25
| | * | fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been c...Florin Peter2013-05-151-25/+28
| | |/
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-171-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-05-161-1/+1
| * | Merge branch 'master' into fix-3353Thomas Mueller2013-05-152-1/+74
| |\ \
| | * \ Merge pull request #3374 from owncloud/vobject_compound_propertyThomas Müller2013-05-151-0/+70
| | |\ \
| | | * | Add Compound property to avoid double escaping values.Thomas Tanghus2013-05-151-0/+70
| | | |/
| | * / fix for losing mount point "/"Florin Peter2013-05-151-1/+4
| | |/
| * / Fix finding mount in background watcher, fixes #3353Michael Gapczynski2013-05-151-2/+2
| |/
* | fix for webdav because initMounts() is triggered twice so we lost the root pathFlorin Peter2013-05-201-1/+3
* | Revert "fix for webdav and wrong reference for findByStorageId"Florin Peter2013-05-202-4/+2
* | fix for webdav and wrong reference for findByStorageIdFlorin Peter2013-05-192-2/+4
* | revert changesFlorin Peter2013-05-171-28/+25
* | add pre-shared hooksBjörn Schießle2013-05-161-0/+22
* | allow admin to recover users files in case of password lostBjörn Schießle2013-05-161-3/+4
* | fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been c...Florin Peter2013-05-151-25/+28
* | merge changes for files_encryptionFlorin Peter2013-05-151-40/+42
* | fix for losing mount point "/"Florin Peter2013-05-151-1/+4
* | Merge branch 'master' into files_encryptionFlorin Peter2013-05-1595-863/+1136
|\|
| * Set the SQLite database lock timeout to 60 seconds which is the default in PH...Frank Karlitschek2013-05-131-1/+1
| * Merge pull request #3311 from owncloud/disable_mbstring.func_overloadMorris Jobke2013-05-121-0/+1
| |\
| | * disable mbstring.func_overload in setupThomas Tanghus2013-05-121-0/+1
| * | Get config from templateLukas Reschke2013-05-121-1/+1
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-05-122-1/+20
| * Merge pull request #3283 from owncloud/move-legacy-fsMorris Jobke2013-05-102-0/+0
| |\
| | * Move legacy filesystem classesRobin Appelman2013-05-082-0/+0
| * | don't emit rename hooks on partial file renamesJörn Friedrich Dreyer2013-05-101-2/+2
| * | rename isIgnoredFile to isPartialFile, remove check of blacklisted files in i...Jörn Friedrich Dreyer2013-05-102-10/+16
| * | don't call correctFolder() in touchHook, it will be called later in the write...Björn Schießle2013-05-081-1/+0
| * | update etag for for the touched fileBjörn Schießle2013-05-081-1/+9
| |/
| * Merge pull request #3271 from owncloud/fix_for_util_tearDownFSFlorinPeter2013-05-081-0/+1
| |\
| | * fix for tearDownFS, after filesystem::tearDown() the root is not mountedFlorin Peter2013-05-071-0/+1
| * | Autoloader: fix loading app clases located in lib/Robin Appelman2013-05-081-5/+6
| * | Autoloader: load the 3rdparty libraries using prefixesRobin Appelman2013-05-071-17/+16
| * | check for setlocale after setting up the paths to prevent autoloader confusionRobin Appelman2013-05-071-2/+7
| * | Autoloader: add support for custom namespace pathsRobin Appelman2013-05-071-1/+19
| * | Autoloader: split getting the class paths and loading the classRobin Appelman2013-05-071-7/+20
| * | Allow disabling the global classpath in an autoloaderRobin Appelman2013-05-071-3/+19
| * | Allow the autoloader to try mutliple possible paths for each pathRobin Appelman2013-05-071-24/+17
| * | Add per-autoloader classPathRobin Appelman2013-05-071-3/+24
| * | Move autoloader to it's own classRobin Appelman2013-05-072-56/+71
| |/