Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-22 | 8 | -20/+47 |
|\ | |||||
| * | cleanup codestyle | Jörn Friedrich Dreyer | 2013-05-22 | 2 | -4/+4 |
| * | use to_char only for oracle, whitespace | Jörn Friedrich Dreyer | 2013-05-22 | 3 | -9/+18 |
| * | add debug output | Jörn Friedrich Dreyer | 2013-05-22 | 6 | -15/+30 |
| * | allow install when only oracle is available | Jörn Friedrich Dreyer | 2013-05-22 | 1 | -1/+2 |
| * | Merge pull request #3406 from owncloud/oc_dialogs_oc_template | Morris Jobke | 2013-05-22 | 1 | -0/+1 |
| |\ | |||||
| | * | Port OC.dialogs to use octemplate except for prompt() and form(). | Thomas Tanghus | 2013-05-16 | 1 | -0/+1 |
* | | | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-22 | 8 | -8/+162 |
|\| | | |||||
| * | | Merge pull request #3266 from owncloud/hooks | Thomas Müller | 2013-05-21 | 3 | -0/+137 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into hooks | Thomas Mueller | 2013-05-15 | 18 | -86/+396 |
| | |\ \ | |||||
| | * | | | fix typo | Robin Appelman | 2013-05-09 | 2 | -2/+2 |
| | * | | | New hook system | Robin Appelman | 2013-05-07 | 3 | -0/+137 |
| * | | | | merge master into filecache_mtime | Robin Appelman | 2013-05-21 | 114 | -1201/+2669 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge pull request #3335 from owncloud/prevent-scan-loop | Jörn Friedrich Dreyer | 2013-05-21 | 1 | -1/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Prevent backgroundScan() from looping if opendir() is failing for the same path | Michael Gapczynski | 2013-05-13 | 1 | -1/+3 |
| * | | | | | | Merge branch 'master' into filecache_mtime | Michael Gapczynski | 2013-03-08 | 68 | -463/+1554 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | merge master into filecache_mtime | Robin Appelman | 2013-02-15 | 93 | -540/+1546 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Emulate touch() for backends that don't support it | Robin Appelman | 2013-02-10 | 1 | -6/+10 |
| * | | | | | | | | Cache: bookkeeping of storage_mtime | Robin Appelman | 2013-02-10 | 3 | -4/+16 |
| * | | | | | | | | Cache: add seccond mtime field | Robin Appelman | 2013-02-10 | 1 | -1/+1 |
* | | | | | | | | | Merge branch 'master' into files_encryption | Björn Schießle | 2013-05-21 | 2 | -0/+33 |
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Remove debug output | Thomas Tanghus | 2013-05-20 | 1 | -1/+0 |
| * | | | | | | | | Add rename() method to OC_VCategories. | Thomas Tanghus | 2013-05-20 | 1 | -0/+32 |
| * | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-20 | 1 | -0/+2 |
* | | | | | | | | | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-20 | 6 | -10/+82 |
|\| | | | | | | | | |||||
| * | | | | | | | | Merge pull request #3421 from owncloud/pre_login_password | Michael Gapczynski | 2013-05-19 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | Add password to pre_login | Lukas Reschke | 2013-05-19 | 1 | -2/+2 |
| | | |_|_|/ / / / | | |/| | | | | | | |||||
| * | | | | | | | | Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_a... | FlorinPeter | 2013-05-17 | 1 | -4/+6 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | only connect share hooks if installation OC is installed | Florin Peter | 2013-05-17 | 1 | -4/+6 |
| | * | | | | | | | | revert changes | Florin Peter | 2013-05-17 | 1 | -28/+25 |
| | * | | | | | | | | fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been c... | Florin Peter | 2013-05-15 | 1 | -25/+28 |
| | |/ / / / / / / | |||||
| * | | | | | | / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-17 | 1 | -1/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
| * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-05-16 | 1 | -1/+1 |
| * | | | | | | | Merge branch 'master' into fix-3353 | Thomas Mueller | 2013-05-15 | 2 | -1/+74 |
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | | | |||||
| | * | | | | | | Merge pull request #3374 from owncloud/vobject_compound_property | Thomas Müller | 2013-05-15 | 1 | -0/+70 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Add Compound property to avoid double escaping values. | Thomas Tanghus | 2013-05-15 | 1 | -0/+70 |
| | | |/ / / / / | |||||
| | * / / / / / | fix for losing mount point "/" | Florin Peter | 2013-05-15 | 1 | -1/+4 |
| | |/ / / / / | |||||
| * / / / / / | Fix finding mount in background watcher, fixes #3353 | Michael Gapczynski | 2013-05-15 | 1 | -2/+2 |
| |/ / / / / | |||||
* | | | | | | fix for webdav because initMounts() is triggered twice so we lost the root path | Florin Peter | 2013-05-20 | 1 | -1/+3 |
* | | | | | | Revert "fix for webdav and wrong reference for findByStorageId" | Florin Peter | 2013-05-20 | 2 | -4/+2 |
* | | | | | | fix for webdav and wrong reference for findByStorageId | Florin Peter | 2013-05-19 | 2 | -2/+4 |
* | | | | | | revert changes | Florin Peter | 2013-05-17 | 1 | -28/+25 |
* | | | | | | add pre-shared hooks | Björn Schießle | 2013-05-16 | 1 | -0/+22 |
* | | | | | | allow admin to recover users files in case of password lost | Björn Schießle | 2013-05-16 | 1 | -3/+4 |
* | | | | | | fix for SQLite3Result::fetchArray(): The SQLite3Result object has not been c... | Florin Peter | 2013-05-15 | 1 | -25/+28 |
* | | | | | | merge changes for files_encryption | Florin Peter | 2013-05-15 | 1 | -40/+42 |
* | | | | | | fix for losing mount point "/" | Florin Peter | 2013-05-15 | 1 | -1/+4 |
* | | | | | | Merge branch 'master' into files_encryption | Florin Peter | 2013-05-15 | 95 | -863/+1136 |
|\| | | | | | |||||
| * | | | | | Set the SQLite database lock timeout to 60 seconds which is the default in PH... | Frank Karlitschek | 2013-05-13 | 1 | -1/+1 |
| * | | | | | Merge pull request #3311 from owncloud/disable_mbstring.func_overload | Morris Jobke | 2013-05-12 | 1 | -0/+1 |
| |\ \ \ \ \ |