Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue | Thomas Müller | 2015-09-24 | 2 | -1/+9 |
|\ | | | | | fix issue with version rollback and thumbnails | ||||
| * | delete cached preview when rolling back file's version | Georg Ehrke | 2015-09-20 | 2 | -1/+9 |
| | | | | | | | | | | | | | | | | add random number using OC.parseQueryString and _.extend() version rollback: add missing prefix to OC\Preview::post_delete add test to assure that the rollback hook is called | ||||
* | | Merge pull request #19306 from owncloud/app-code-check-version | Thomas Müller | 2015-09-24 | 1 | -0/+146 |
|\ \ | | | | | | | [App Code Check] add check for version and mandatory fields | ||||
| * | | public, remote and default_enable are not deprecated | Morris Jobke | 2015-09-24 | 1 | -3/+3 |
| | | | |||||
| * | | encode arrays as string | Morris Jobke | 2015-09-24 | 1 | -1/+6 |
| | | | |||||
| * | | [App Code Check] add check for version and mandatory fields | Morris Jobke | 2015-09-24 | 1 | -0/+141 |
| | | | | | | | | | | | | | | | * ref #17598 * including unit tests for mandatory fields/versions | ||||
* | | | Merge pull request #19337 from owncloud/fix-shipped-check-for-apps | Thomas Müller | 2015-09-24 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Correctly check whether an app is shipped | ||||
| * | | | Correctly check whether an app is shipped | Joas Schilling | 2015-09-24 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #19340 from owncloud/enc_fix_user_check | Thomas Müller | 2015-09-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | only check if the user exists if a user was added as parameter | ||||
| * | | | | only check if the user exists if a user was added as parameter | Bjoern Schiessle | 2015-09-24 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #19248 from ↵ | Thomas Müller | 2015-09-24 | 3 | -1/+134 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | owncloud/allow-status-code-403-and-503-for-listeners Convert exceptions to SabreExceptions for the HTTP status code | ||||
| * | | | Add since-tag | Joas Schilling | 2015-09-23 | 2 | -0/+14 |
| | | | | |||||
| * | | | Allow listeners to set status code and message | Joas Schilling | 2015-09-23 | 3 | -1/+120 |
| | | | | |||||
* | | | | Merge pull request #19303 from owncloud/usecorrectvariable | Thomas Müller | 2015-09-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use correct variable | ||||
| * | | | | use correct variable | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | |/ / | |/| | | | | | | | | | | wow ... just wow ... | ||||
* | | | | Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-null | Thomas Müller | 2015-09-24 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Allow `set('column', 'null')` to work like in Doctrine's QueryBuilder | ||||
| * | | | | Allow `set('column', 'null')` to work like in Doctrine | Joas Schilling | 2015-09-24 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatches | Thomas Müller | 2015-09-24 | 1 | -1/+4 |
|\ \ \ \ | |/ / / |/| | | | Prevent wrong matches in getRelativePath | ||||
| * | | | Prevent wrong matches in getRelativePath | Vincent Petry | 2015-09-22 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | Before this fix, the root "/files" with path "/files_trashbin" would return "_trashbin" as relative path... | ||||
* | | | | Show 'Apps' in the browser title when app management is open | Thomas Müller | 2015-09-23 | 2 | -3/+8 |
| |/ / |/| | | |||||
* | | | Revert "use correct variable" | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | | | | | | | | | | | | This reverts commit 52cbaff061b93cb1a5e81623e58e14867c818810. | ||||
* | | | use correct variable | Jörn Friedrich Dreyer | 2015-09-23 | 1 | -1/+1 |
| | | | | | | | | | wow ... just wow ... | ||||
* | | | Merge pull request #19289 from owncloud/fix-type-hint-errors-container | Thomas Müller | 2015-09-23 | 2 | -2/+3 |
|\ \ \ | | | | | | | | | Fix type hint errors in the container and the interface | ||||
| * \ \ | Merge branch 'master' into fix-type-hint-errors-container | Morris Jobke | 2015-09-23 | 1 | -12/+24 |
| |\ \ \ | |||||
| * | | | | Fix type hint errors in the container and the interface | Joas Schilling | 2015-09-23 | 2 | -2/+3 |
| | | | | | |||||
* | | | | | Merge pull request #19236 from owncloud/call_dot_directories_function | Thomas Müller | 2015-09-23 | 5 | -6/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir | ||||
| * | | | | | Replaces if ($file === '.' || $file === '..') by ↵ | Martin | 2015-09-22 | 5 | -6/+6 |
| |/ / / / | | | | | | | | | | | | | | | | if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used. | ||||
* | | | | | Merge pull request #19247 from owncloud/fix_locking_copy_operation | Thomas Müller | 2015-09-23 | 1 | -42/+55 |
|\ \ \ \ \ | |_|/ / / |/| | | | | locking: handle exceptions correctly during copy operation | ||||
| * | | | | catch excexptions during the copy operation and make sure that we free the ↵ | Bjoern Schiessle | 2015-09-22 | 1 | -42/+55 |
| | |/ / | |/| | | | | | | | | | | lock correctly | ||||
* | | | | Merge pull request #19267 from ↵ | Thomas Müller | 2015-09-23 | 1 | -12/+24 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | owncloud/individual-it-reduce_db_calls_for_filelocks [jenkins] Individual it reduce db calls for filelocks | ||||
| * | | | reduce amount of db calls needed for file-locks | Individual IT Services | 2015-09-22 | 1 | -12/+24 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | return result of insertIfNotExist() reducing initLockField, throwing exeption in releaseLock don't throw exception in releaseLock() cleaning up whitespaces | ||||
* | | | Move mimetype files into /resources/config/ | Lukas Reschke | 2015-09-22 | 2 | -14/+25 |
| | | | |||||
* | | | Move certificate bundle into resources/config/ | Lukas Reschke | 2015-09-22 | 3 | -9/+2 |
| | | | |||||
* | | | Merge pull request #19268 from owncloud/revert-18911 | Robin Appelman | 2015-09-22 | 1 | -6/+0 |
|\ \ \ | | | | | | | | | Revert "Show cached previews directly" | ||||
| * | | | Revert "Show cached previews directly" | Robin Appelman | 2015-09-22 | 1 | -6/+0 |
| |/ / | | | | | | | | | | This reverts commit 1b708e26efbcb4052becad3d7b6618064c2605a6. | ||||
* / / | Move dummy backend to Tests namespace | Lukas Reschke | 2015-09-22 | 2 | -169/+4 |
|/ / | |||||
* | | Merge pull request #19231 from phil-davis/r1 | Thomas Müller | 2015-09-21 | 2 | -4/+4 |
|\ \ | | | | | | | Minor text typos | ||||
| * | | Minor text typos | Phil Davis | 2015-09-21 | 2 | -4/+4 |
| |/ | | | | | | | that I noticed while looking at some code. | ||||
* | | Merge pull request #18481 from owncloud/fix-apache-login-master | Thomas Müller | 2015-09-21 | 1 | -4/+6 |
|\ \ | | | | | | | Repeated calls to loginWithApache() should not not try to set user in… | ||||
| * | | Repeated calls to loginWithApache() should not not try to set user ↵ | Thomas Müller | 2015-09-21 | 1 | -4/+6 |
| | | | | | | | | | | | | information in the session again | ||||
* | | | Merge pull request #19221 from owncloud/improved_error_messages | Thomas Müller | 2015-09-21 | 1 | -0/+5 |
|\ \ \ | | | | | | | | | decrypt-all: improved error message if user doesn't exists | ||||
| * | | | improved error message if user doesn't exists | Bjoern Schiessle | 2015-09-21 | 1 | -0/+5 |
| |/ / | |||||
* | | | Merge pull request #17347 from owncloud/dav-fopen-overwrite | Robin Appelman | 2015-09-21 | 1 | -2/+7 |
|\ \ \ | | | | | | | | | dont download the existing file for webdav if we're going to overwrite it | ||||
| * | | | dont download the existing file for webdav if we're going to overwrite it | Robin Appelman | 2015-09-21 | 1 | -2/+7 |
| |/ / | |||||
* | | | Merge pull request #19081 from owncloud/prevent0bytedownloads | Robin Appelman | 2015-09-21 | 1 | -2/+5 |
|\ \ \ | |/ / |/| | | prevent 0 byte downloads when storage returns false | ||||
| * | | prevent 0 byte downloads when storage returns false | Jörn Friedrich Dreyer | 2015-09-17 | 1 | -2/+5 |
| | | | |||||
* | | | Merge pull request #19122 from owncloud/discardexpirationdatefornonlinkshares | Thomas Müller | 2015-09-21 | 1 | -0/+5 |
|\ \ \ | |_|/ |/| | | Discard expiration date from result for non-link shares | ||||
| * | | Discard expiration date from result for non-link shares | Vincent Petry | 2015-09-17 | 1 | -0/+5 |
| |/ | |||||
* | | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7 | Thomas Müller | 2015-09-18 | 1 | -4/+1 |
|\ \ | | | | | | | [jenkins] changed ZipStreamer to use composer for updates, update to 0.7 | ||||
| * \ | Merge branch 'zipstreamer-0.7' of https://github.com/McNetic/owncloud_core ↵ | Thomas Müller | 2015-09-18 | 1 | -4/+1 |
| |\ \ | | | | | | | | | | | | | into McNetic-zipstreamer-0.7 |