aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* improved error messagesBjörn Schießle2013-05-222-6/+12
* Merge branch 'master' into files_encryptionBjörn Schießle2013-05-2228-361/+324
|\
| * Merge pull request #3337 from owncloud/oracle_fixesThomas Müller2013-05-227-20/+45
| |\
| | * 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-226-322/+255
| |\
| | * Remove more obsolete code.Thomas Tanghus2013-05-201-20/+4
| | * Don't set image path in template.Thomas Tanghus2013-05-202-2/+2
| | * Dialogs: Home folder icon instead of '/'.Thomas Tanghus2013-05-172-3/+8
| | * Dialogs: Fix method names.Thomas Tanghus2013-05-171-65/+52
| | * Dialogs: Cleanup.Thomas Tanghus2013-05-171-101/+26
| | * Dialogs: Loose up-button.Thomas Tanghus2013-05-173-16/+0
| | * Dialogs: Make slug show last dir emphasized.Thomas Tanghus2013-05-172-5/+6
| | * Various cleanups in OC.dialogsThomas Tanghus2013-05-174-148/+118
| | * Merge branch 'oc_dialogs_oc_template' of github.com:owncloud/core into oc_dia...Thomas Tanghus2013-05-160-0/+0
| | |\
| | | * Port OC.dialogs to use octemplate except for prompt() and form().Thomas Tanghus2013-05-165-140/+216
| | * | Line length etc.Thomas Tanghus2013-05-161-2/+3
| | * | Port OC.dialogs to use octemplate except for prompt() and form().Thomas Tanghus2013-05-165-140/+216
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2215-19/+23
* | | | fix pgsql errorFlorin Peter2013-05-221-2/+5
* | | | Merge branch 'master' into files_encryptionFlorin Peter2013-05-2214-16/+541
|\| | |
| * | | Merge pull request #3266 from owncloud/hooksThomas Müller2013-05-215-0/+453
| |\ \ \
| | * \ \ Merge branch 'master' into hooksThomas Mueller2013-05-15280-3935/+5198
| | |\ \ \
| | * | | | fix typoRobin Appelman2013-05-093-11/+11
| | * | | | New hook systemRobin Appelman2013-05-075-0/+453
| * | | | | Merge pull request #1586 from owncloud/filecache_mtimeThomas Müller2013-05-219-15/+85
| |\ \ \ \ \
| | * \ \ \ \ merge master into filecache_mtimeRobin Appelman2013-05-211551-36980/+65298
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | 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-081108-24118/+36055
| | | |\ \ \ \ \
| | | * \ \ \ \ \ merge master into filecache_mtimeRobin Appelman2013-02-15764-13905/+58775
| | | |\ \ \ \ \ \
| | | * | | | | | | Emulate touch() for backends that don't support itRobin Appelman2013-02-102-8/+42
| | | * | | | | | | Cache: bookkeeping of storage_mtimeRobin Appelman2013-02-106-10/+40
| | | * | | | | | | Cache: add seccond mtime fieldRobin Appelman2013-02-102-1/+9
* | | | | | | | | | improved testsFlorin Peter2013-05-226-388/+301
* | | | | | | | | | fixed finding encrypted files in subfolders and removed unused codeFlorin Peter2013-05-224-200/+61
* | | | | | | | | | added webdav testFlorin Peter2013-05-211-0/+251
* | | | | | | | | | fixed postFileSizeFlorin Peter2013-05-211-11/+19
* | | | | | | | | | Merge branch 'master' into files_encryptionBjörn Schießle2013-05-2154-214/+388
|\| | | | | | | | |
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2124-64/+104
| * | | | | | | | | Merge pull request #3430 from owncloud/vcategory_renameThomas Müller2013-05-202-0/+42
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Add test for renaming non-existing category.Thomas Tanghus2013-05-201-0/+1
| | * | | | | | | | | Remove debug outputThomas Tanghus2013-05-201-1/+0
| | * | | | | | | | | Add rename() method to OC_VCategories.Thomas Tanghus2013-05-202-0/+42
| |/ / / / / / / / /
| * | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-05-2039-161/+248
* | | | | | | | | | fix path to 3rdparty appsBjörn Schießle2013-05-211-1/+2
* | | | | | | | | | fix path, needs to be relative to data/Björn Schießle2013-05-211-1/+1
* | | | | | | | | | move 3rdparty dependencies to appBjörn Schießle2013-05-215-3/+647