summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into files_encryptionBjörn Schießle2013-05-228-20/+47
|\
| * cleanup codestyleJörn Friedrich Dreyer2013-05-222-4/+4
| * use to_char only for oracle, whitespaceJörn Friedrich Dreyer2013-05-223-9/+18
| * add debug outputJörn Friedrich Dreyer2013-05-226-15/+30
| * allow install when only oracle is availableJörn Friedrich Dreyer2013-05-221-1/+2
| * Merge pull request #3406 from owncloud/oc_dialogs_oc_templateMorris Jobke2013-05-221-0/+1
| |\
| | * Port OC.dialogs to use octemplate except for prompt() and form().Thomas Tanghus2013-05-161-0/+1
* | | Merge branch 'master' into files_encryptionFlorin Peter2013-05-228-8/+162
|\| |
| * | Merge pull request #3266 from owncloud/hooksThomas Müller2013-05-213-0/+137
| |\ \
| | * \ Merge branch 'master' into hooksThomas Mueller2013-05-1518-86/+396
| | |\ \
| | * | | fix typoRobin Appelman2013-05-092-2/+2
| | * | | New hook systemRobin Appelman2013-05-073-0/+137
| * | | | merge master into filecache_mtimeRobin Appelman2013-05-21114-1201/+2669
| |\ \ \ \
| | * \ \ \ Merge pull request #3335 from owncloud/prevent-scan-loopJörn Friedrich Dreyer2013-05-211-1/+3
| | |\ \ \ \
| | | * | | | Prevent backgroundScan() from looping if opendir() is failing for the same pathMichael Gapczynski2013-05-131-1/+3
| * | | | | | Merge branch 'master' into filecache_mtimeMichael Gapczynski2013-03-0868-463/+1554
| |\ \ \ \ \ \
| * \ \ \ \ \ \ merge master into filecache_mtimeRobin Appelman2013-02-1593-540/+1546
| |\ \ \ \ \ \ \
| * | | | | | | | Emulate touch() for backends that don't support itRobin Appelman2013-02-101-6/+10
| * | | | | | | | Cache: bookkeeping of storage_mtimeRobin Appelman2013-02-103-4/+16
| * | | | | | | | Cache: add seccond mtime fieldRobin Appelman2013-02-101-1/+1
* | | | | | | | | 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
| |\ \ \ \ \