Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | To isolate the variable scope used inside the $file it is required in it's ↵ | Thomas Müller | 2014-04-09 | 1 | -1/+9 |
| | | | | own method | ||||
* | Fix Undefined index: storage in share.php | Joas Schilling | 2014-04-09 | 1 | -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 transifex | Jenkins for ownCloud | 2014-04-09 | 2 | -9/+18 |
| | |||||
* | Merge pull request #8117 from owncloud/fix-hard-coded-uman-str | Thomas Müller | 2014-04-08 | 1 | -5/+6 |
|\ | | | | | Make hardcoded exception messages translatable | ||||
| * | Make hardcoded exception messages translatable | Volkan Gezer | 2014-04-08 | 1 | -5/+6 |
| | | |||||
* | | Merge pull request #7643 from owncloud/chainable_response | Thomas Müller | 2014-04-08 | 3 | -0/+22 |
|\ \ | |/ |/| | Chainable Response in AppFramework | ||||
| * | Add @return PHPDocs | Thomas Tanghus | 2014-03-10 | 3 | -0/+7 |
| | | |||||
| * | Chainable Response in AppFramework | Thomas Tanghus | 2014-03-09 | 3 | -0/+15 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-08 | 2 | -0/+17 |
| | | |||||
* | | using array_key_exists() instead of isset() - required because in case the ↵ | Thomas Müller | 2014-04-07 | 1 | -1/+1 |
| | | | | | | | | value is null isset is returning false | ||||
* | | fixing undefined exception classes | Thomas Müller | 2014-04-07 | 1 | -3/+3 |
| | | |||||
* | | Merge pull request #8088 from owncloud/fix-personal.js | Thomas Müller | 2014-04-07 | 1 | -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üller | 2014-04-07 | 1 | -0/+1 |
| | | | | | | | | | | | | enter while changing the display name - refs #8085 | ||||
* | | | Merge pull request #8083 from owncloud/fix-link-to-sync | Thomas Müller | 2014-04-07 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | Remove wrong whitespace from URL and use HTTPS | ||||
| * | | Switch to HTTPS | Lukas Reschke | 2014-04-06 | 1 | -1/+1 |
| | | | |||||
| * | | Remove wrong whitespace from URL and use HTTPS | Lukas Reschke | 2014-04-06 | 1 | -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/master | blizzz | 2014-04-07 | 1 | -7/+7 |
|\ \ \ | | | | | | | | | Remove dependency on container, removing service locator antipattern | ||||
| * | | | Remove dependency on container, removing service locator antipattern | Bernhard Posselt | 2014-04-02 | 1 | -7/+7 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-04-07 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #8064 from owncloud/remove-not-existing-functions | Lukas Reschke | 2014-04-06 | 1 | -27/+0 |
|\ \ \ \ | |_|/ / |/| | | | Removed two unused functions | ||||
| * | | | Removed two unused functions | Lukas Reschke | 2014-04-04 | 1 | -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 transifex | Jenkins for ownCloud | 2014-04-06 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #8055 from owncloud/getfileinfo-exists | icewind1991 | 2014-04-04 | 1 | -0/+3 |
|\ \ \ | | | | | | | | | dont scan not existing files in View->getFileInfo | ||||
| * | | | dont scan not existing files in View->getFileInfo | Robin Appelman | 2014-04-04 | 1 | -0/+3 |
| | | | | |||||
* | | | | Merge pull request #8039 from owncloud/chunking-removeexpireinhaskey | Vincent Petry | 2014-04-04 | 1 | -5/+0 |
|\ \ \ \ | |/ / / |/| | | | Do not expire chunks while checking for their existence | ||||
| * | | | Do not expire chunks while checking for their existence | Vincent Petry | 2014-04-03 | 1 | -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-reuse | Vincent Petry | 2014-04-04 | 1 | -3/+6 |
|\ \ \ | | | | | | | | | Allow reusing FileInfo for getStorageInfo | ||||
| * | | | Allow reusing FileInfo for getStorageInfo | Robin Appelman | 2014-04-02 | 1 | -3/+6 |
| |/ / | |||||
* | | | Merge pull request #7476 from owncloud/type-hinting | Thomas Müller | 2014-04-03 | 15 | -32/+26 |
|\ \ \ | |/ / |/| | | Type hinting | ||||
| * | | Merge branch 'master' into type-hinting | Bart Visscher | 2014-03-31 | 132 | -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 updates | Bart Visscher | 2014-02-28 | 4 | -7/+8 |
| | | | | |||||
| * | | | Type is with a small letter | Bart Visscher | 2014-02-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | More PHPDoc fixes, using scrutinizer patches as hints | Bart Visscher | 2014-02-28 | 10 | -19/+14 |
| | | | | |||||
| * | | | Update PHPDoc for I10N, OC_Config, OC\Template\Base and OCP\IL10N | Bart Visscher | 2014-02-28 | 4 | -27/+26 |
| | | | | |||||
* | | | | Merge pull request #8006 from wakeup/master | Morris Jobke | 2014-04-02 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Fix admin-dir_permissions redirection when cannot write warning is shown. | ||||
| * | | | | Fix admin-dir_permissions redirection when cannot write warning | Volkan Gezer | 2014-04-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | is shown. | ||||
* | | | | | Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled | Morris Jobke | 2014-04-02 | 1 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | always encrypt files to owner | ||||
| * | | | | | always encrypt files to owner | Bjoern Schiessle | 2014-03-31 | 1 | -3/+3 |
| | |_|/ / | |/| | | | |||||
* | | | | | Merge pull request #7968 from owncloud/core-overwritewebrootwithroot | Vincent Petry | 2014-04-02 | 1 | -2/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow using "/" in "overwritewebroot" | ||||
| * | | | | | Allow using "/" in "overwritewebroot" | Vincent Petry | 2014-03-31 | 1 | -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-fixfilegetcontentsloop | Vincent Petry | 2014-04-02 | 1 | -6/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | Correctly read the full stream in file_get_contents | ||||
| * | | | | | Added missing fclose in file_get_contents and file_put_contents | Vincent Petry | 2014-04-01 | 1 | -1/+4 |
| | | | | | | |||||
| * | | | | | Correctly read the full stream in file_get_contents | Vincent Petry | 2014-04-01 | 1 | -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 transifex | Jenkins for ownCloud | 2014-04-02 | 2 | -1/+7 |
| | | | | | |||||
* | | | | | Merge pull request #7884 from owncloud/use-idn_to_ascii-if-available | Thomas Müller | 2014-04-01 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | idn_to_ascii is only used if available | ||||
| * | | | | | idn_to_ascii is only used if available | Thomas Müller | 2014-03-26 | 1 | -0/+3 |
| | | | | | | |||||
* | | | | | | Merge pull request #7935 from owncloud/getpath-shared | Vincent Petry | 2014-04-01 | 2 | -6/+31 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Make getPath work for shared files | ||||
| * | | | | | Improve phpdoc | Robin Appelman | 2014-03-31 | 1 | -1/+3 |
| | | | | | | |||||
| * | | | | | Give storages the option to implement the getById behaviour for View->getPath | Robin Appelman | 2014-03-28 | 2 | -6/+29 |
| | | | | | | |||||
* | | | | | | Merge pull request #7696 from owncloud/chunk-remainingspacefix | Vincent Petry | 2014-04-01 | 2 | -3/+48 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fixed chunking and insufficient storage check |