summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-04-112-1/+4
|
* Merge pull request #8139 from owncloud/fix-middleware-registrationBernhard Posselt2014-04-102-5/+5
|\ | | | | register middleware as string to not force request to be instantiated to...
| * register middleware as string to not force request to be instantiated too ↵Bernhard Posselt2014-04-092-5/+5
| | | | | | | | early and thus not having url parameters
* | Merge pull request #8107 from owncloud/dav-negativetimestampfixThomas Müller2014-04-101-3/+6
|\ \ | | | | | | Fixed Sabre Node implementation to correctly return timestamps as int
| * | Fixed Sabre Node implementation to correctly return timestamps as intVincent Petry2014-04-091-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Negative timestamps were returned as string and were confusing other Sabre API like Sabre_DAV_Property_GetLastModified. This fix makes sure the timestamp is returned as int when defined.
* | | Merge pull request #8137 from owncloud/routeing-requirementsThomas Müller2014-04-101-1/+9
|\ \ \ | | | | | | | | add requirements to routing
| * | | add requirements to routingBernhard Posselt2014-04-091-1/+9
| | |/ | |/|
* | | Merge pull request #8138 from owncloud/allow-app-in-routes.phpThomas Müller2014-04-101-1/+9
|\ \ \ | | | | | | | | To isolate the variable scope used inside the $file it is required in it...
| * | | To isolate the variable scope used inside the $file it is required in it's ↵Thomas Müller2014-04-091-1/+9
| |/ / | | | | | | | | | own method
* | | Merge pull request #8027 from owncloud/routes-ocsTom Needham2014-04-101-1/+1
|\ \ \ | | | | | | | | Load all routes when matching an ocs route
| * | | Load all routes when matching an ocs routeRobin Appelman2014-04-031-1/+1
| | | |
* | | | Merge pull request #8018 from owncloud/ocs_result_success_is_100Vincent Petry2014-04-101-1/+1
|\ \ \ \ | | | | | | | | | | OC_OCS_Result Class, Only accept 100 code as success
| * | | | Only accept success as 100 like the OCS spec doestomneedham2014-04-021-1/+1
| |/ / /
* | | | Merge pull request #7825 from owncloud/hash-streamVincent Petry2014-04-101-3/+5
|\ \ \ \ | | | | | | | | | | Use streams when generating hashes of remote files
| * | | | use binary safe readRobin Appelman2014-04-021-1/+1
| | | | |
| * | | | Use streams when generating hashes of remote filesRobin Appelman2014-04-021-3/+5
| | | | |
* | | | | Merge pull request #8053 from owncloud/preview-hook-rootVincent Petry2014-04-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Pass the correct root to the preview on post_write
| * | | | | Pass the correct root to the preview on post_writeRobin Appelman2014-04-041-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-1048-47/+177
| |_|_|/ / |/| | | |
* | | | | Fix Undefined index: storage in share.phpJoas Schilling2014-04-091-1/+1
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | There parameter was removed when the code was cleaned up: {"app":"PHP","message":"Undefined index: storage at E:\\ownCloud\\owncloud\\lib\\private\\share\\share.php#1160", "level":0,"time":"2014-04-09T12:56:23+00:00"}
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-092-9/+18
| | | |
* | | | Merge pull request #8117 from owncloud/fix-hard-coded-uman-strThomas Müller2014-04-081-5/+6
|\ \ \ \ | | | | | | | | | | Make hardcoded exception messages translatable
| * | | | Make hardcoded exception messages translatableVolkan Gezer2014-04-081-5/+6
| | | | |
* | | | | Merge pull request #7643 from owncloud/chainable_responseThomas Müller2014-04-083-0/+22
|\ \ \ \ \ | |/ / / / |/| | | | Chainable Response in AppFramework
| * | | | Add @return PHPDocsThomas Tanghus2014-03-103-0/+7
| | | | |
| * | | | Chainable Response in AppFrameworkThomas Tanghus2014-03-093-0/+15
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-082-0/+17
| | | | |
* | | | | using array_key_exists() instead of isset() - required because in case the ↵Thomas Müller2014-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | value is null isset is returning false
* | | | | fixing undefined exception classesThomas Müller2014-04-071-3/+3
| | | | |
* | | | | Merge pull request #8088 from owncloud/fix-personal.jsThomas Müller2014-04-071-0/+1
|\ \ \ \ \ | | | | | | | | | | | | reduce code duplication, fix parse error, prevent page reload on hitting...
| * | | | | reduce code duplication, fix parse error, prevent page reload on hitting ↵Thomas Müller2014-04-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | enter while changing the display name - refs #8085
* | | | | | Merge pull request #8083 from owncloud/fix-link-to-syncThomas Müller2014-04-071-2/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Remove wrong whitespace from URL and use HTTPS
| * | | | | Switch to HTTPSLukas Reschke2014-04-061-1/+1
| | | | | |
| * | | | | Remove wrong whitespace from URL and use HTTPSLukas Reschke2014-04-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The whitespace caused the generated links to begin with a whitespace (e.g. `<a href=" http://owncloud.org/sync-clients/" target="_blank">`) Additionally I switched the link to HTTPS.
* | | | | | Merge pull request #8017 from Raydiation/masterblizzz2014-04-071-7/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove dependency on container, removing service locator antipattern
| * | | | | | Remove dependency on container, removing service locator antipatternBernhard Posselt2014-04-021-7/+7
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-071-0/+6
| | | | | |
* | | | | | Merge pull request #8064 from owncloud/remove-not-existing-functionsLukas Reschke2014-04-061-27/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Removed two unused functions
| * | | | | Removed two unused functionsLukas Reschke2014-04-041-27/+0
| | | | | | | | | | | | | | | | | | These two functions were actually not usable and only a todo since ages. I think it's better to remove it than having dead and unmaintained code.
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-061-1/+1
|/ / / / /
* | | | | Merge pull request #8055 from owncloud/getfileinfo-existsicewind19912014-04-041-0/+3
|\ \ \ \ \ | | | | | | | | | | | | dont scan not existing files in View->getFileInfo
| * | | | | dont scan not existing files in View->getFileInfoRobin Appelman2014-04-041-0/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #8039 from owncloud/chunking-removeexpireinhaskeyVincent Petry2014-04-041-5/+0
|\ \ \ \ \ | |/ / / / |/| | | | Do not expire chunks while checking for their existence
| * | | | Do not expire chunks while checking for their existenceVincent Petry2014-04-031-5/+0
| |/ / / | | | | | | | | | | | | | | | | The expiration should be done by the gc() function on login, not while isComplete() is calling hasKey() for every chunk.
* | | | Merge pull request #8015 from owncloud/storageinfo-reuseVincent Petry2014-04-041-3/+6
|\ \ \ \ | | | | | | | | | | Allow reusing FileInfo for getStorageInfo
| * | | | Allow reusing FileInfo for getStorageInfoRobin Appelman2014-04-021-3/+6
| |/ / /
* | | | Merge pull request #7476 from owncloud/type-hintingThomas Müller2014-04-0315-32/+26
|\ \ \ \ | |/ / / |/| | | Type hinting
| * | | Merge branch 'master' into type-hintingBart Visscher2014-03-31132-3136/+3938
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/image.php lib/private/l10n.php lib/private/request.php lib/private/share/mailnotifications.php lib/private/template/base.php
| * | | | More PHPDoc updatesBart Visscher2014-02-284-7/+8
| | | | |
| * | | | Type is with a small letterBart Visscher2014-02-281-1/+1
| | | | |