summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* To isolate the variable scope used inside the $file it is required in it's ↵Thomas Müller2014-04-091-1/+9
| | | | own method
* 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
| | | |
| * | | More PHPDoc fixes, using scrutinizer patches as hintsBart Visscher2014-02-2810-19/+14
| | | |
| * | | Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10NBart Visscher2014-02-284-27/+26
| | | |
* | | | Merge pull request #8006 from wakeup/masterMorris Jobke2014-04-021-1/+1
|\ \ \ \ | | | | | | | | | | Fix admin-dir_permissions redirection when cannot write warning is shown.
| * | | | Fix admin-dir_permissions redirection when cannot write warningVolkan Gezer2014-04-021-1/+1
| | | | | | | | | | | | | | | | | | | | is shown.
* | | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabledMorris Jobke2014-04-021-3/+3
|\ \ \ \ \ | | | | | | | | | | | | always encrypt files to owner
| * | | | | always encrypt files to ownerBjoern Schiessle2014-03-311-3/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #7968 from owncloud/core-overwritewebrootwithrootVincent Petry2014-04-021-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Allow using "/" in "overwritewebroot"
| * | | | | Allow using "/" in "overwritewebroot"Vincent Petry2014-03-311-2/+3
| |/ / / / | | | | | | | | | | | | | | | | | | | | Whenever the reverse proxy is using "/" as the webroot, it is now possible to set that value in "overwritewebroot"
* | | | | Merge pull request #7979 from owncloud/core-fixfilegetcontentsloopVincent Petry2014-04-021-6/+6
|\ \ \ \ \ | | | | | | | | | | | | Correctly read the full stream in file_get_contents
| * | | | | Added missing fclose in file_get_contents and file_put_contentsVincent Petry2014-04-011-1/+4
| | | | | |
| * | | | | Correctly read the full stream in file_get_contentsVincent Petry2014-04-011-5/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using user-defined stream wrappers, PHP will return a maximum of 8192 bytes even if more was requested. This fix uses stream_get_contents to make sure the full stream is read and not only the first 8 KB. Added unit test with a bigger test file to cover this case.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-04-022-1/+7
| | | | |
* | | | | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-availableThomas Müller2014-04-011-0/+3
|\ \ \ \ \ | | | | | | | | | | | | idn_to_ascii is only used if available
| * | | | | idn_to_ascii is only used if availableThomas Müller2014-03-261-0/+3
| | | | | |
* | | | | | Merge pull request #7935 from owncloud/getpath-sharedVincent Petry2014-04-012-6/+31
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Make getPath work for shared files
| * | | | | Improve phpdocRobin Appelman2014-03-311-1/+3
| | | | | |
| * | | | | Give storages the option to implement the getById behaviour for View->getPathRobin Appelman2014-03-282-6/+29
| | | | | |
* | | | | | Merge pull request #7696 from owncloud/chunk-remainingspacefixVincent Petry2014-04-012-3/+48
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fixed chunking and insufficient storage check