| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into fix-5388-master | tomneedham | 2013-12-11 | 77 | -150/+720 |
| |\ | |||||
| | * | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-09 | 1 | -0/+8 |
| | | | |||||
| | * | Merge pull request #6231 from owncloud/fix-plural-l10n | blizzz | 2013-12-09 | 1 | -1/+1 |
| | |\ | | | | | | | fix plural translation - fixes #6226 | ||||
| | | * | fix plural translation - fixes #6226 | Morris Jobke | 2013-12-07 | 1 | -1/+1 |
| | | | | |||||
| | * | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-07 | 2 | -4/+21 |
| | |/ | |||||
| | * | Merge pull request #6150 from owncloud/backgroundjob-log-exception | blizzz | 2013-12-06 | 3 | -7/+27 |
| | |\ | | | | | | | Remove background jobs that are giving errors | ||||
| | | * | remove background jobs if they are failing | Robin Appelman | 2013-12-02 | 1 | -0/+1 |
| | | | | |||||
| | | * | Catch exceptions from background jobs and log them | Robin Appelman | 2013-12-02 | 3 | -7/+26 |
| | | | | |||||
| | * | | Merge pull request #6201 from owncloud/backgroundscan-reuse-etag | Vincent Petry | 2013-12-06 | 1 | -1/+1 |
| | |\ \ | | | | | | | | | reuse etags when doing a background scan | ||||
| | | * \ | Merge branch 'master' into backgroundscan-reuse-etag | Robin Appelman | 2013-12-06 | 4 | -19/+34 |
| | | |\ \ | |||||
| | | * | | | reuse etags when doing a background scan | Robin Appelman | 2013-12-05 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | XSendfile and encryption don't work together | Bart Visscher | 2013-12-06 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | | The file on disk is encrypted, and not readable on client systems | ||||
| | * | | | | Users of getFolderContent are mostly interested in the unecrypted file size | Bart Visscher | 2013-12-06 | 1 | -0/+4 |
| | | |/ / | |/| | | |||||
| | * | | | Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire | Björn Schießle | 2013-12-06 | 1 | -14/+21 |
| | |\ \ \ | | | | | | | | | | | Sharing etag propagation on expire | ||||
| | | * | | | add a optional parameter to skip check for expired files, this is necessary ↵ | Bjoern Schiessle | 2013-12-05 | 1 | -14/+21 |
| | | |/ / | | | | | | | | | | | | | to find out to whom a file was shared after it was expired. | ||||
| | * | | | Revert "Revert "Fix user's displayName being overwritten by (old) cookie"" | Morris Jobke | 2013-12-05 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | This reverts commit eba35d28cd974507f9e81e15430d3d33dbbd9973. | ||||
| | * | | | Revert "Fix user's displayName being overwritten by (old) cookie" | Morris Jobke | 2013-12-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | This reverts commit 2a7380cc21e56ce12b1a0e1460fabc978a83090b. | ||||
| | * | | | Fix user's displayName being overwritten by (old) cookie | Nico Kaiser | 2013-12-05 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-04 | 2 | -4/+13 |
| | |/ / | |||||
| | * | | Merge pull request #6169 from owncloud/php_version_warning | Morris Jobke | 2013-12-04 | 1 | -2/+10 |
| | |\ \ | | | | | | | | | PHP version warning | ||||
| | | * | | lower required php version to 5.3.3 | Frank Karlitschek | 2013-12-04 | 1 | -2/+10 |
| | | | | | |||||
| | * | | | Merge pull request #6168 from owncloud/extstorage-testtestmethod | Frank Karlitschek | 2013-12-03 | 1 | -0/+8 |
| | |\ \ \ | | | | | | | | | | | Added unit test for the test() method of ext storage | ||||
| | | * | | | Added unit test for the test() method | Vincent Petry | 2013-12-03 | 1 | -0/+8 |
| | | | |/ | | |/| | | | | | | | | | This is to make sure that method isn't broken | ||||
| | * | | | Merge pull request #6076 from owncloud/fix-6073-master | Thomas Müller | 2013-12-03 | 2 | -24/+43 |
| | |\ \ \ | | |_|/ | |/| | | Correct property name. It's just 'tableprefix', without the 'db' prefix. | ||||
| | | * | | fixing PHPDoc and spelling | Thomas Mueller | 2013-12-02 | 2 | -6/+8 |
| | | | | | |||||
| | | * | | Use getLastError() everywhere. | Andreas Fischer | 2013-11-28 | 1 | -10/+10 |
| | | | | | |||||
| | | * | | Add getLastError() | Andreas Fischer | 2013-11-28 | 1 | -3/+20 |
| | | | | | |||||
| | | * | | No function as oci_last_error. It's oci_error. | Andreas Fischer | 2013-11-28 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | There is no property such as dbusername. It's 'dbuser'. | Andreas Fischer | 2013-11-28 | 1 | -3/+3 |
| | | | | | |||||
| | | * | | Correct property name. It's 'dbpassword', with the 'db' prefix. | Andreas Fischer | 2013-11-28 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Correct property name. It's just 'tableprefix', without the 'db' prefix. | Andreas Fischer | 2013-11-28 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Merge pull request #5929 from owncloud/code_check_on | Frank Karlitschek | 2013-12-03 | 1 | -2/+1 |
| | |\ \ \ | | | | | | | | | | | switch code checker on by default. apps are not allowed to access | ||||
| | | * | | | switch code checker on by default. apps are not allowed to access some of ↵ | Frank Karlitschek | 2013-11-18 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | the internal classes where we have a public api for now | ||||
| | * | | | | Merge pull request #6158 from owncloud/rmdir-check | Thomas Müller | 2013-12-02 | 1 | -2/+6 |
| | |\ \ \ \ | | | | | | | | | | | | | check if a directory exists before we try to remove it | ||||
| | | * | | | | check if a directory exists before we try to remove it | Robin Appelman | 2013-12-02 | 1 | -2/+6 |
| | | | |_|/ | | |/| | | |||||
| | * / | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-02 | 6 | -13/+22 |
| | |/ / / | |||||
| | * | | | Merge pull request #6052 from owncloud/datetime-doctrine | Thomas Müller | 2013-12-01 | 1 | -3/+5 |
| | |\ \ \ | | | | | | | | | | | Get rid of date strings for DB. Completely use Doctrine and DateTime. | ||||
| | | * | | | Use the Doctrine to convert date string to DateTime object. | Andreas Fischer | 2013-11-26 | 1 | -1/+2 |
| | | | | | | |||||
| | | * | | | Use DateTime object instead of fixed format date string. | Andreas Fischer | 2013-11-26 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Use a DateTime object and have conversion handled by Doctrine instead of using a date string with a fixed format. | ||||
| | | * | | | Use bindValue() instead of passing parameters in execute(). | Andreas Fischer | 2013-11-26 | 1 | -1/+3 |
| | | | | | | |||||
| | * | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-29 | 3 | -1/+7 |
| | | | | | | |||||
| | * | | | | Merge pull request #6129 from owncloud/chunking-fixtouchafterassemble | Frank Karlitschek | 2013-11-29 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | Fixed touch after chunk assembling | ||||
| | | * | | | | Fixed touch after chunk assembling | Vincent Petry | 2013-11-29 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed touch after chunk assembling which was using the wrong path, resulting in the creation of an extra file. Fixes #6007 | ||||
| | * | | | | | make 5.3.8 the minimum supported version. This fixes several issues with ↵ | Frank Karlitschek | 2013-11-29 | 1 | -4/+4 |
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | broken PHP versions like: https://github.com/owncloud/core/issues/5734 Also make the version compare clearer. It was pure luck that floatval on a php version returned the correct value. | ||||
| | * | | | | Merge pull request #6077 from owncloud/fix-api-documentation | Frank Karlitschek | 2013-11-29 | 3 | -2/+31 |
| | |\ \ \ \ | | | | | | | | | | | | | API doc for contacts manager, server container and share | ||||
| | | * | | | | add comment from @DeepDiver | Morris Jobke | 2013-11-27 | 1 | -2/+1 |
| | | | | | | | |||||
| | | * | | | | API doc for contacts manager, server container and share | Morris Jobke | 2013-11-27 | 3 | -2/+32 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #6099 from owncloud/fix_source_not_found_warnings | Morris Jobke | 2013-11-28 | 1 | -1/+5 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | make sure that we don't try to access an already deleted files | ||||
| | | * | | | | | correctFolder() already resolves the dirname internally | Bjoern Schiessle | 2013-11-28 | 1 | -1/+1 |
| | | | | | | | | |||||
| | | * | | | | | make sure that we don't try to access an already deleted files, fixes some ↵ | Bjoern Schiessle | 2013-11-28 | 1 | -2/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | file source not found warnings | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |