summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15098 from owncloud/fix_preview_versions_revert_issueThomas Müller2015-09-242-1/+9
|\ | | | | fix issue with version rollback and thumbnails
| * delete cached preview when rolling back file's versionGeorg Ehrke2015-09-202-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-versionThomas Müller2015-09-241-0/+146
|\ \ | | | | | | [App Code Check] add check for version and mandatory fields
| * | public, remote and default_enable are not deprecatedMorris Jobke2015-09-241-3/+3
| | |
| * | encode arrays as stringMorris Jobke2015-09-241-1/+6
| | |
| * | [App Code Check] add check for version and mandatory fieldsMorris Jobke2015-09-241-0/+141
| | | | | | | | | | | | | | | * ref #17598 * including unit tests for mandatory fields/versions
* | | Merge pull request #19337 from owncloud/fix-shipped-check-for-appsThomas Müller2015-09-241-1/+1
|\ \ \ | | | | | | | | Correctly check whether an app is shipped
| * | | Correctly check whether an app is shippedJoas Schilling2015-09-241-1/+1
| | | |
* | | | Merge pull request #19340 from owncloud/enc_fix_user_checkThomas Müller2015-09-241-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 parameterBjoern Schiessle2015-09-241-1/+1
| |/ / /
* | | | Merge pull request #19248 from ↵Thomas Müller2015-09-243-1/+134
|\ \ \ \ | |/ / / |/| | | | | | | | | | | owncloud/allow-status-code-403-and-503-for-listeners Convert exceptions to SabreExceptions for the HTTP status code
| * | | Add since-tagJoas Schilling2015-09-232-0/+14
| | | |
| * | | Allow listeners to set status code and messageJoas Schilling2015-09-233-1/+120
| | | |
* | | | Merge pull request #19303 from owncloud/usecorrectvariableThomas Müller2015-09-241-1/+1
|\ \ \ \ | | | | | | | | | | Use correct variable
| * | | | use correct variableJörn Friedrich Dreyer2015-09-231-1/+1
| | |/ / | |/| | | | | | | | | | wow ... just wow ...
* | | | Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-nullThomas Müller2015-09-241-1/+1
|\ \ \ \ | | | | | | | | | | Allow `set('column', 'null')` to work like in Doctrine's QueryBuilder
| * | | | Allow `set('column', 'null')` to work like in DoctrineJoas Schilling2015-09-241-1/+1
| |/ / /
* | | | Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatchesThomas Müller2015-09-241-1/+4
|\ \ \ \ | |/ / / |/| | | Prevent wrong matches in getRelativePath
| * | | Prevent wrong matches in getRelativePathVincent Petry2015-09-221-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 openThomas Müller2015-09-232-3/+8
| |/ / |/| |
* | | Revert "use correct variable"Jörn Friedrich Dreyer2015-09-231-1/+1
| | | | | | | | | | | | This reverts commit 52cbaff061b93cb1a5e81623e58e14867c818810.
* | | use correct variableJörn Friedrich Dreyer2015-09-231-1/+1
| | | | | | | | | wow ... just wow ...
* | | Merge pull request #19289 from owncloud/fix-type-hint-errors-containerThomas Müller2015-09-232-2/+3
|\ \ \ | | | | | | | | Fix type hint errors in the container and the interface
| * \ \ Merge branch 'master' into fix-type-hint-errors-containerMorris Jobke2015-09-231-12/+24
| |\ \ \
| * | | | Fix type hint errors in the container and the interfaceJoas Schilling2015-09-232-2/+3
| | | | |
* | | | | Merge pull request #19236 from owncloud/call_dot_directories_functionThomas Müller2015-09-235-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir
| * | | | | Replaces if ($file === '.' || $file === '..') by ↵Martin2015-09-225-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_operationThomas Müller2015-09-231-42/+55
|\ \ \ \ \ | |_|/ / / |/| | | | locking: handle exceptions correctly during copy operation
| * | | | catch excexptions during the copy operation and make sure that we free the ↵Bjoern Schiessle2015-09-221-42/+55
| | |/ / | |/| | | | | | | | | | lock correctly
* | | | Merge pull request #19267 from ↵Thomas Müller2015-09-231-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-locksIndividual IT Services2015-09-221-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 Reschke2015-09-222-14/+25
| | |
* | | Move certificate bundle into resources/config/Lukas Reschke2015-09-223-9/+2
| | |
* | | Merge pull request #19268 from owncloud/revert-18911Robin Appelman2015-09-221-6/+0
|\ \ \ | | | | | | | | Revert "Show cached previews directly"
| * | | Revert "Show cached previews directly"Robin Appelman2015-09-221-6/+0
| |/ / | | | | | | | | | This reverts commit 1b708e26efbcb4052becad3d7b6618064c2605a6.
* / / Move dummy backend to Tests namespaceLukas Reschke2015-09-222-169/+4
|/ /
* | Merge pull request #19231 from phil-davis/r1Thomas Müller2015-09-212-4/+4
|\ \ | | | | | | Minor text typos
| * | Minor text typosPhil Davis2015-09-212-4/+4
| |/ | | | | | | that I noticed while looking at some code.
* | Merge pull request #18481 from owncloud/fix-apache-login-masterThomas Müller2015-09-211-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üller2015-09-211-4/+6
| | | | | | | | | | | | information in the session again
* | | Merge pull request #19221 from owncloud/improved_error_messagesThomas Müller2015-09-211-0/+5
|\ \ \ | | | | | | | | decrypt-all: improved error message if user doesn't exists
| * | | improved error message if user doesn't existsBjoern Schiessle2015-09-211-0/+5
| |/ /
* | | Merge pull request #17347 from owncloud/dav-fopen-overwriteRobin Appelman2015-09-211-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 itRobin Appelman2015-09-211-2/+7
| |/ /
* | | Merge pull request #19081 from owncloud/prevent0bytedownloadsRobin Appelman2015-09-211-2/+5
|\ \ \ | |/ / |/| | prevent 0 byte downloads when storage returns false
| * | prevent 0 byte downloads when storage returns falseJörn Friedrich Dreyer2015-09-171-2/+5
| | |
* | | Merge pull request #19122 from owncloud/discardexpirationdatefornonlinksharesThomas Müller2015-09-211-0/+5
|\ \ \ | |_|/ |/| | Discard expiration date from result for non-link shares
| * | Discard expiration date from result for non-link sharesVincent Petry2015-09-171-0/+5
| |/
* | Merge pull request #19028 from owncloud/McNetic-zipstreamer-0.7Thomas Müller2015-09-181-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üller2015-09-181-4/+1
| |\ \ | | | | | | | | | | | | into McNetic-zipstreamer-0.7