Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #14126 from owncloud/remove-that-old-thing | Lukas Reschke | 2015-02-11 | 1 | -54/+0 |
|\ | | | | | Remove unused file | ||||
| * | Remove unused file | Lukas Reschke | 2015-02-11 | 1 | -54/+0 |
|/ | | | | This file is unused and has been last modified two years ago. Furthermore it won't evne work anymore properly because it uses things like `CONFIG_DATEFORMAT` which are gone a long time ago... | ||||
* | Merge pull request #14097 from yanntech/fix/utf8-check | Thomas Müller | 2015-02-11 | 1 | -1/+3 |
|\ | | | | | in some case charset can be in lower case. | ||||
| * | in some case charset can be in lower case. | Yann VERRY | 2015-02-11 | 1 | -1/+3 |
| | | | | | | | | Add strtoupper() in UTF-8 check to avoid error message | ||||
* | | Merge pull request #13979 from ↵ | Vincent Petry | 2015-02-11 | 2 | -5/+16 |
|\ \ | | | | | | | | | | | | | owncloud/group-share-collition-wrong-type-in-post-hook Do not overwrite the shareType so the post hook is still correct | ||||
| * | | Add a test for the post_shared hook shareType | Joas Schilling | 2015-02-09 | 1 | -0/+11 |
| | | | |||||
| * | | Do not overwrite the shareType so the post hook is still correct | Joas Schilling | 2015-02-09 | 1 | -5/+5 |
| | | | |||||
* | | | Merge pull request #14105 from owncloud/second-parameter-is-optional | Thomas Müller | 2015-02-11 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | Second parameter is optional | ||||
| * | | Second parameter is optional | Lukas Reschke | 2015-02-11 | 1 | -1/+1 |
|/ / | | | | | | | Makes my IDE happier. | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-11 | 61 | -37/+83 |
| | | |||||
* | | Merge pull request #14074 from RealRancor/documents_preview_notes | Morris Jobke | 2015-02-11 | 1 | -0/+4 |
|\ \ | | | | | | | Add hint for troubleshooting MS Word previews | ||||
| * | | Add hint for troubleshooting MS Word previews | RealRancor | 2015-02-10 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #13861 from owncloud/remove-disabled-files-repair-step | Thomas Müller | 2015-02-10 | 2 | -52/+0 |
|\ \ \ | | | | | | | | | Revert "enabled disabled files app in repair step" | ||||
| * | | | Revert "enabled disabled files app in repair step" | Morris Jobke | 2015-02-03 | 2 | -52/+0 |
| | | | | | | | | | | | | | | | | This reverts commit d70160c6077ca017d6cb7d61f066fe33e3b1e081. | ||||
* | | | | Merge pull request #14072 from owncloud/add-files-external-test-readme | Lukas Reschke | 2015-02-10 | 1 | -0/+58 |
|\ \ \ \ | |_|/ / |/| | | | add readme for files external tests | ||||
| * | | | add rreadme for files external tests | Morris Jobke | 2015-02-10 | 1 | -0/+58 |
|/ / / | |||||
* | | | Merge pull request #11056 from AdamWill/9885-opcode | Morris Jobke | 2015-02-10 | 2 | -2/+31 |
|\ \ \ | | | | | | | | | add function to invalidate one opcache file, use it if possible #9885 | ||||
| * | | | writeData(): correct variable name for config file path | Adam Williamson | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | It changed since we wrote this patch. | ||||
| * | | | deleteFromOpcodeCache: make parameter mandatory, document parameter | Adam Williamson | 2014-11-06 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Both pointed out in submission review by @bantu, thanks. | ||||
| * | | | add function to invalidate one opcache file, use it if possible #9885 | Adam Williamson | 2014-11-06 | 2 | -2/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #9885 appears to be triggered by ownCloud invalidating the entire PHP opcache. Testing indicates it can be avoided by only invalidating the single file that was written from the opcache, instead of clearing the whole thing. In general it is more efficient to invalidate only the single file that was changed, rather than the whole cache. This adds a deleteFromOpcodeCache() function which invalidates a single file from the opcache if possible, returning true if the underlying function returns true (which may mean 'success', or 'file does not exist', or 'file exists but is not in opcache', all of which are OK to treat as good for our purposes). It also changes writeData() in config.php to try using deleteFromOpcodeCache() and only fall back on clearOpcodeCache() if that fails. | ||||
* | | | | Merge pull request #13190 from is-apps/master-sftp-key | Vincent Petry | 2015-02-10 | 10 | -7/+472 |
|\ \ \ \ | | | | | | | | | | | Add SFTP public key authentication support | ||||
| * | | | | Add support for SFTP key authentication | Ross Nicoll | 2015-01-14 | 10 | -7/+472 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for external files accessed via SFTP using public key exchange authentication. Keys are generated automatically when the configuration is added, or can be regenerated on demand if a key is compromised. Creation of a new configuration row now triggers focus on that row. This is used to trigger auto-configuration for SFTP keys. Generated public keys are saved in user's data directory for easy retrieval by an external application. Add controller for SFTP key generation AJAX SFTP class initialisation no longer produces a warning if the password field is missing. Add unit tests for SFTP with key authentication backend | ||||
* | | | | | Merge pull request #14028 from frsela/charset_utf8 | Lukas Reschke | 2015-02-10 | 2 | -0/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | Setting default charset to UTF-8 in .htaccess and .user.ini | ||||
| * | | | | | Setting default charset to UTF-8 in .htaccess and .user.ini | Fernando Rodriguez Sela | 2015-02-10 | 2 | -0/+2 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-02-10 | 28 | -110/+134 |
| | | | | | |||||
* | | | | | Merge pull request #13425 from owncloud/phpdoc_cleanup | Morris Jobke | 2015-02-10 | 19 | -63/+63 |
|\ \ \ \ \ | | | | | | | | | | | | | Cleanup of PHPDoc return types | ||||
| * | | | | | Cleanup of PHPDoc return types | Robin McCorkell | 2015-01-16 | 19 | -63/+63 |
| | | | | | | |||||
* | | | | | | Merge pull request #13663 from ↵ | Morris Jobke | 2015-02-10 | 2 | -5/+17 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue/13624-notification-when-favorting-fails Only update favorite icon if the operation was successful | ||||
| * | | | | | | toggle back when the action was not performed | Joas Schilling | 2015-02-02 | 1 | -2/+7 |
| | | | | | | | |||||
| * | | | | | | fix response for tags and show error message | Morris Jobke | 2015-02-02 | 2 | -6/+11 |
| | | | | | | | |||||
| * | | | | | | Only update favorite icon if the operation was successful | Joas Schilling | 2015-02-02 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also shows a notification in case an error occured on updating the tags | ||||
* | | | | | | | Merge pull request #13842 from owncloud/is_file_2_is_readable | Morris Jobke | 2015-02-09 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | check if cache files are readable | ||||
| * | | | | | | | readd is_file | Jörn Friedrich Dreyer | 2015-02-03 | 2 | -2/+2 |
| | | | | | | | | |||||
| * | | | | | | | :camel:case | Arthur Schiwon | 2015-02-02 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | check if cache files are readable | Jörn Friedrich Dreyer | 2015-02-02 | 2 | -2/+2 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #14007 from owncloud/fix-broken-master | Morris Jobke | 2015-02-09 | 1 | -6/+16 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [master] Request requires a second parameter | ||||
| * | | | | | | | | Request requires a second parameter | Thomas Müller | 2015-02-09 | 1 | -6/+16 |
|/ / / / / / / / | |||||
* | | | | | | | | Merge pull request #13923 from owncloud/l10n-ignore-jsmin | Thomas Müller | 2015-02-09 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Ignore minified js in translation process | ||||
| * | | | | | | | | ignore minified js, owncloud/news#719 | Bernhard Posselt | 2015-02-05 | 1 | -1/+1 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #13511 from owncloud/naturalsort_speeeeeed | Lukas Reschke | 2015-02-09 | 2 | -11/+13 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | NaturalSort performance improvements | ||||
| * | | | | | | | | | Store FileInfo::getType() result for future use | Robin McCorkell | 2015-02-09 | 1 | -4/+3 |
| | | | | | | | | | | |||||
| * | | | | | | | | | Performance improvements for NaturalSort | Robin McCorkell | 2015-02-09 | 1 | -7/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A combination of using isset() instead of count() or strlen(), caching the chunkify function, and replacing is_numeric() with some comparisons | ||||
* | | | | | | | | | | Merge pull request #13928 from owncloud/prevent_ghost_files_master | Vincent Petry | 2015-02-09 | 1 | -2/+9 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | prevent creation of ghost directories | ||||
| * | | | | | | | | | | for password protected link shares the password is stored in shareWith, so ↵ | Bjoern Schiessle | 2015-02-05 | 1 | -2/+9 |
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | we need to set this manually to null for the hooks | ||||
* | | | | | | | | | | Merge pull request #13921 from owncloud/ocs-af | Vincent Petry | 2015-02-09 | 7 | -7/+406 |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Add a controller and reponse for ocs | ||||
| * | | | | | | | | | | fix license email | Bernhard Posselt | 2015-02-05 | 1 | -1/+1 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | fix license email | Bernhard Posselt | 2015-02-05 | 4 | -8/+8 |
| | | | | | | | | | | | |||||
| * | | | | | | | | | | add a controller and reponse for ocs | Bernhard Posselt | 2015-02-05 | 5 | -1/+400 |
| | | | | | | | | | | | |||||
* | | | | | | | | | | | Merge pull request #13852 from owncloud/cache-app-versions | Vincent Petry | 2015-02-09 | 1 | -2/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Cache app versions | ||||
| * | | | | | | | | | | | clear app version cache on upgrade | Robin Appelman | 2015-02-03 | 1 | -0/+1 |
| | | | | | | | | | | | |