aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-0138-8/+426
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-2842-16/+184
|
* Fix version revLukas Reschke2015-02-281-1/+1
|
* This is 8.0.1 nowFrank Karlitschek2015-02-281-1/+1
|
* This is not 8.1 pre alphaFrank Karlitschek2015-02-281-2/+2
|
* Merge pull request #14585 from owncloud/fix-avatars-for-users-with-atLukas Reschke2015-02-272-3/+3
|\ | | | | Use custom attribute instead of the div identifier
| * Use custom attribute instead of the div identifierLukas Reschke2015-02-272-3/+3
| | | | | | | | | | | | Otherwise problems arrive when a username contains characters such as an `@` Fixes https://github.com/owncloud/user_shibboleth/issues/38
* | Merge pull request #14575 from owncloud/cache-rename-overwriteMorris Jobke2015-02-272-1/+17
|\ \ | | | | | | Fix cache update when doing a rename that overwrites the target
| * | Fix cache update when doing a rename that overwrites the targetRobin Appelman2015-02-272-1/+17
| |/
* | Merge pull request #13616 from owncloud/streamresponseBernhard Posselt2015-02-279-30/+369
|\ \ | | | | | | AppFramework StreamResponse
| * | AppFramework StreamResponseBernhard Posselt2015-02-279-30/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | First stab at the StreamResponse, see #12988 The idea is to use an interface ICallbackResponse (I'm not 100% happy with the name yet, suggestions?) that allow the response to output things in its own way, for instance stream the file using readfile Unittests are atm lacking, plan is to check if a mock of ICallbackResponse will be used by calling its callback (also unhappy with this name) method Usage is: $response = new StreamResponse('path/to/file'); rename io to output, add additional methods and handle error and not modified cases when using StreamResponse fix indention and uppercasing, also handle forbidden cases fix indention fix indention no forbidden, figuring out if a file is really readable is too complicated to get to work across OSes and streams remove useless import remove useless import fix intendation
* | | Merge pull request #14566 from owncloud/fix-avatars-in-masterMorris Jobke2015-02-271-1/+1
|\ \ \ | | | | | | | | Fix avatars in master
| * | | Fix avatars in masterLukas Reschke2015-02-271-1/+1
| | | |
* | | | Merge pull request #14567 from owncloud/node-check-fileinfo-interfaceJoas Schilling2015-02-272-0/+41
|\ \ \ \ | |_|_|/ |/| | | Add "throws" lines to calling methods and interface aswell
| * | | Add "throws" lines to calling methods and interface aswellJoas Schilling2015-02-272-0/+41
| | | |
* | | | Merge pull request #14565 from owncloud/more-httpsThomas Müller2015-02-272-5/+5
|\ \ \ \ | |/ / / |/| | | Add more HTTPS endpoints
| * | | Add more HTTPS endpointsLukas Reschke2015-02-272-5/+5
| |/ / | | | | | | | | | The doc server can now finally speak SSL...
* | | Merge pull request #14437 from owncloud/node-check-fileinfoThomas Müller2015-02-272-2/+31
|\ \ \ | |/ / |/| | Check if we have a proper fileinfo
| * | Add unit testRobin Appelman2015-02-261-0/+15
| | |
| * | Check if we have a proper fileinfoRobin Appelman2015-02-251-2/+16
| | |
* | | Merge pull request #14529 from owncloud/intuitive-version-checkThomas Müller2015-02-272-9/+84
|\ \ \ | |_|/ |/| | Make version check work on the lowest common version denominator
| * | add phpdocBernhard Posselt2015-02-261-0/+20
| | |
| * | make version check work on the lowest common version denominatorBernhard Posselt2015-02-262-9/+64
| | |
* | | Merge pull request #14563 from owncloud/LukasReschke-patch-1Morris Jobke2015-02-271-0/+2
|\ \ \ | | | | | | | | Add notice about Travis Checks
| * | | Add notice about Travis ChecksLukas Reschke2015-02-271-0/+2
|/ / / | | | | | | Maybe it helps in the future so we won't forget it again :see_no_evil:
* | | Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-27793-14657/+7383
|\ \ \ | | | | | | | | Revert "Updating license headers"
| * | | Revert "Updating license headers"Morris Jobke2015-02-26793-14657/+7383
| |/ / | | | | | | | | | This reverts commit 6a1a4880f0d556fb090f19a5019fec31916f5c36.
* | | Merge pull request #14561 from owncloud/fix-sftpThomas Müller2015-02-271-1/+4
|\ \ \ | | | | | | | | apply suggestions from @atmoz to fix SFTP setup
| * | | apply suggestions from @atmoz to fix SFTP setupMorris Jobke2015-02-261-1/+4
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-27108-196/+116
| | | |
* | | | Merge pull request #14550 from owncloud/gc-warningThomas Müller2015-02-261-1/+2
|\ \ \ \ | | | | | | | | | | Fix warning in filecache gc
| * | | | fix warning in gcRobin Appelman2015-02-261-1/+2
| | | | |
* | | | | Merge pull request #14532 from owncloud/defaultvalueforremoteidVincent Petry2015-02-262-1/+2
|\ \ \ \ \ | |/ / / / |/| | | | Add default value for remote_id
| * | | | Bump up files_sharing version for schema updateVincent Petry2015-02-261-1/+1
| | | | |
| * | | | Add default value for remote_idVincent Petry2015-02-261-0/+1
| | |/ / | |/| | | | | | | | | | Fixes SQLite migration with non-null column.
* | | | Merge pull request #14503 from owncloud/quota-preventdatalossforfailedmoveLukas Reschke2015-02-264-13/+120
|\ \ \ \ | |_|/ / |/| | | Fix file move/copy when storage space is not enough
| * | | Delete target file for unsuccessful copy/renameVincent Petry2015-02-262-10/+85
| | | |
| * | | Properly detect streamCopy errorsVincent Petry2015-02-252-3/+35
| | | | | | | | | | | | | | | | Now checking whether the written bytes match the number of read bytes.
* | | | Merge pull request #14527 from owncloud/clarify-linkMorris Jobke2015-02-261-1/+1
|\ \ \ \ | | | | | | | | | | clarify link on apps management to the dev documentation
| * | | | clarify link on apps management to the dev documentationMorris Jobke2015-02-261-1/+1
| | | | |
* | | | | Merge pull request #14474 from owncloud/move-utf-8-check-to-setupMorris Jobke2015-02-263-25/+7
|\ \ \ \ \ | | | | | | | | | | | | Move UTF-8 check to setup
| * | | | | Move UTF-8 check to setupLukas Reschke2015-02-243-25/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Nobody reads the warnings anyways and so we should enforce it at installation time... Also allows us to get rid of some duplicated code. To test change the `default_charset` to something other than `utf-8` or `UTF-8`, both should work fine with that change here. An error should then get shown. We already set those default charsets in the shipped .user.ini and .htaccess
* | | | | | Merge pull request #14505 from owncloud/dav-copy-fixMorris Jobke2015-02-261-14/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixes WebDAV copy
| * | | | | | Removed unused $node variableVincent Petry2015-02-261-1/+1
| | | | | | |
| * | | | | | Fixes WebDAV copyVincent Petry2015-02-251-14/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | - added existence check for source argument - removed extra logic for folders, as $view->copy() already supports that internally
* | | | | | Merge pull request #13969 from raimund-schluessler/masterMorris Jobke2015-02-261-4/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Append search results to custom container
| * | | | | | Fix variable already definedRaimund Schlüßler2015-02-091-1/+1
| | | | | | |
| * | | | | | Append search results to custom containerRaimund Schlüßler2015-02-081-4/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #13968
* | | | | | | update 3rdparty to current masterMorris Jobke2015-02-261-0/+0
| | | | | | |
* | | | | | | Merge pull request #14300 from owncloud/commandbusMorris Jobke2015-02-2617-4/+468
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add async command system to handle asynchronous operations