summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * | | | | | | | | | | no fruitless count attempts, and notification should disappearArthur Schiwon2015-02-052-5/+11
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #13977 from owncloud/tempmanager-check-handleJoas Schilling2015-02-091-6/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Check directory handle before we use it
| * | | | | | | | | | | Check directory handle before we use itRobin Appelman2015-02-091-6/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #13958 from owncloud/fix-resize-overlapJan-Christoph Borchardt2015-02-091-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid dropdown to float under sidebar for mid narrow screens
| * | | | | | | | | | | | Avoid dropdown to float under sidebar for mid narrow screensMorris Jobke2015-02-061-0/+7
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #13364 from is-apps/files_external_cleanupVincent Petry2015-02-093-57/+82
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | | Clean up files_external
| * | | | | | | | | | | | Updated Dropbox and Google UI Javascript to create input elements instead of ↵Ross Nicoll2015-01-142-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | anchor.
| * | | | | | | | | | | | Change from array() to [] style in files_external application info.Ross Nicoll2015-01-141-54/+75
| | | | | | | | | | | | |
* | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-0920-32/+132
| |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #13948 from owncloud/cache-move-transactionLukas Reschke2015-02-081-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Use transactions when renaming directory contents
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-12 05:04:03 +0000