summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14074 from RealRancor/documents_preview_notesMorris Jobke2015-02-111-0/+4
|\ | | | | Add hint for troubleshooting MS Word previews
| * Add hint for troubleshooting MS Word previewsRealRancor2015-02-101-0/+4
| |
* | Merge pull request #13861 from owncloud/remove-disabled-files-repair-stepThomas Müller2015-02-102-52/+0
|\ \ | | | | | | Revert "enabled disabled files app in repair step"
| * | Revert "enabled disabled files app in repair step"Morris Jobke2015-02-032-52/+0
| | | | | | | | | | | | This reverts commit d70160c6077ca017d6cb7d61f066fe33e3b1e081.
* | | Merge pull request #14072 from owncloud/add-files-external-test-readmeLukas Reschke2015-02-101-0/+58
|\ \ \ | |_|/ |/| | add readme for files external tests
| * | add rreadme for files external testsMorris Jobke2015-02-101-0/+58
|/ /
* | Merge pull request #11056 from AdamWill/9885-opcodeMorris Jobke2015-02-102-2/+31
|\ \ | | | | | | add function to invalidate one opcache file, use it if possible #9885
| * | writeData(): correct variable name for config file pathAdam Williamson2014-11-061-1/+1
| | | | | | | | | | | | It changed since we wrote this patch.
| * | deleteFromOpcodeCache: make parameter mandatory, document parameterAdam Williamson2014-11-061-1/+2
| | | | | | | | | | | | Both pointed out in submission review by @bantu, thanks.
| * | add function to invalidate one opcache file, use it if possible #9885Adam Williamson2014-11-062-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-keyVincent Petry2015-02-1010-7/+472
|\ \ \ | | | | | | | | Add SFTP public key authentication support
| * | | Add support for SFTP key authenticationRoss Nicoll2015-01-1410-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_utf8Lukas Reschke2015-02-102-0/+2
|\ \ \ \ | | | | | | | | | | Setting default charset to UTF-8 in .htaccess and .user.ini
| * | | | Setting default charset to UTF-8 in .htaccess and .user.iniFernando Rodriguez Sela2015-02-102-0/+2
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1028-110/+134
| | | |
* | | | Merge pull request #13425 from owncloud/phpdoc_cleanupMorris Jobke2015-02-1019-63/+63
|\ \ \ \ | | | | | | | | | | Cleanup of PHPDoc return types
| * | | | Cleanup of PHPDoc return typesRobin McCorkell2015-01-1619-63/+63
| | | | |
* | | | | Merge pull request #13663 from ↵Morris Jobke2015-02-102-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 performedJoas Schilling2015-02-021-2/+7
| | | | | |
| * | | | | fix response for tags and show error messageMorris Jobke2015-02-022-6/+11
| | | | | |
| * | | | | Only update favorite icon if the operation was successfulJoas Schilling2015-02-021-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_readableMorris Jobke2015-02-092-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | check if cache files are readable
| * | | | | | readd is_fileJörn Friedrich Dreyer2015-02-032-2/+2
| | | | | | |
| * | | | | | :camel:caseArthur Schiwon2015-02-021-1/+1
| | | | | | |
| * | | | | | check if cache files are readableJörn Friedrich Dreyer2015-02-022-2/+2
| | | | | | |
* | | | | | | Merge pull request #14007 from owncloud/fix-broken-masterMorris Jobke2015-02-091-6/+16
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [master] Request requires a second parameter
| * | | | | | | Request requires a second parameterThomas Müller2015-02-091-6/+16
|/ / / / / / /
* | | | | | | Merge pull request #13923 from owncloud/l10n-ignore-jsminThomas Müller2015-02-091-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Ignore minified js in translation process
| * | | | | | | ignore minified js, owncloud/news#719Bernhard Posselt2015-02-051-1/+1
| | | | | | | |
* | | | | | | | Merge pull request #13511 from owncloud/naturalsort_speeeeeedLukas Reschke2015-02-092-11/+13
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | NaturalSort performance improvements
| * | | | | | | | Store FileInfo::getType() result for future useRobin McCorkell2015-02-091-4/+3
| | | | | | | | |
| * | | | | | | | Performance improvements for NaturalSortRobin McCorkell2015-02-091-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_masterVincent Petry2015-02-091-2/+9
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | prevent creation of ghost directories
| * | | | | | | | | for password protected link shares the password is stored in shareWith, so ↵Bjoern Schiessle2015-02-051-2/+9
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | we need to set this manually to null for the hooks
* | | | | | | | | Merge pull request #13921 from owncloud/ocs-afVincent Petry2015-02-097-7/+406
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Add a controller and reponse for ocs
| * | | | | | | | | fix license emailBernhard Posselt2015-02-051-1/+1
| | | | | | | | | |
| * | | | | | | | | fix license emailBernhard Posselt2015-02-054-8/+8
| | | | | | | | | |
| * | | | | | | | | add a controller and reponse for ocsBernhard Posselt2015-02-055-1/+400
| | | | | | | | | |
* | | | | | | | | | Merge pull request #13852 from owncloud/cache-app-versionsVincent Petry2015-02-091-2/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Cache app versions
| * | | | | | | | | | clear app version cache on upgradeRobin Appelman2015-02-031-0/+1
| | | | | | | | | | |
| * | | | | | | | | | Cache app versionsRobin Appelman2015-02-031-2/+6
| | | | | | | | | | |
* | | | | | | | | | | Merge pull request #13870 from owncloud/drop-oc-preferences-2Vincent Petry2015-02-091-181/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | drop OC\Preferences
| * | | | | | | | | | | drop OC\PreferencesMorris Jobke2015-02-041-181/+0
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #13869 from owncloud/drop-oc-preferencesVincent Petry2015-02-092-122/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | drop OC_Preferences
| * | | | | | | | | | | drop OC_PreferencesMorris Jobke2015-02-042-122/+0
| |/ / / / / / / / / /
* | | | | | | | | | | Merge pull request #13973 from owncloud/enhancement/security/13366Lukas Reschke2015-02-0916-125/+248
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId`
| * | | | | | | | | | Respect `mod_unique_id` and refactor `OC_Request::getRequestId`Lukas Reschke2015-02-0916-125/+248
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `mod_unique_id` is enabled the ID generated by it will be used for logging. This allows for correlation of the Apache logs and the ownCloud logs. Testplan: - [ ] When `mod_unique_id` is enabled the request ID equals the one generated by `mod_unique_id`. - [ ] When `mod_unique_id` is not available the request ID is a 20 character long random string - [ ] The generated Id is stable over the lifespan of one request Changeset looks a little bit larger since I had to adjust every unit test using the HTTP\Request class for proper DI. Fixes https://github.com/owncloud/core/issues/13366
* | | | | | | | | | | Merge pull request #13854 from owncloud/avatar-existsVincent Petry2015-02-093-6/+17
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Add a better way to check if an avatar exists for the user
| * | | | | | | | | | | Add a better way to check if an avatar exists for the userRobin Appelman2015-02-033-6/+17
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #13925 from owncloud/fix-13898blizzz2015-02-092-5/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | no fruitless count attempts, and notification should disappear