summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-1266-70/+176
* Merge pull request #14126 from owncloud/remove-that-old-thingLukas Reschke2015-02-111-54/+0
|\
| * Remove unused fileLukas Reschke2015-02-111-54/+0
|/
* Merge pull request #14097 from yanntech/fix/utf8-checkThomas Müller2015-02-111-1/+3
|\
| * in some case charset can be in lower case.Yann VERRY2015-02-111-1/+3
* | Merge pull request #13979 from owncloud/group-share-collition-wrong-type-in-p...Vincent Petry2015-02-112-5/+16
|\ \
| * | Add a test for the post_shared hook shareTypeJoas Schilling2015-02-091-0/+11
| * | Do not overwrite the shareType so the post hook is still correctJoas Schilling2015-02-091-5/+5
* | | Merge pull request #14105 from owncloud/second-parameter-is-optionalThomas Müller2015-02-111-1/+1
|\ \ \ | |_|/ |/| |
| * | Second parameter is optionalLukas Reschke2015-02-111-1/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-1161-37/+83
* | Merge pull request #14074 from RealRancor/documents_preview_notesMorris Jobke2015-02-111-0/+4
|\ \
| * | 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"Morris Jobke2015-02-032-52/+0
* | | | Merge pull request #14072 from owncloud/add-files-external-test-readmeLukas Reschke2015-02-101-0/+58
|\ \ \ \ | |_|/ / |/| | |
| * | | add rreadme for files external testsMorris Jobke2015-02-101-0/+58
|/ / /
* | | Merge pull request #11056 from AdamWill/9885-opcodeMorris Jobke2015-02-102-2/+31
|\ \ \
| * | | writeData(): correct variable name for config file pathAdam Williamson2014-11-061-1/+1
| * | | deleteFromOpcodeCache: make parameter mandatory, document parameterAdam Williamson2014-11-061-1/+2
| * | | add function to invalidate one opcache file, use it if possible #9885Adam Williamson2014-11-062-2/+30
* | | | Merge pull request #13190 from is-apps/master-sftp-keyVincent Petry2015-02-1010-7/+472
|\ \ \ \
| * | | | Add support for SFTP key authenticationRoss Nicoll2015-01-1410-7/+472
* | | | | Merge pull request #14028 from frsela/charset_utf8Lukas Reschke2015-02-102-0/+2
|\ \ \ \ \
| * | | | | 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 typesRobin McCorkell2015-01-1619-63/+63
* | | | | | Merge pull request #13663 from owncloud/issue/13624-notification-when-favorti...Morris Jobke2015-02-102-5/+17
|\ \ \ \ \ \
| * | | | | | 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
* | | | | | | Merge pull request #13842 from owncloud/is_file_2_is_readableMorris Jobke2015-02-092-2/+2
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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, owncloud/news#719Bernhard Posselt2015-02-051-1/+1
* | | | | | | | | Merge pull request #13511 from owncloud/naturalsort_speeeeeedLukas Reschke2015-02-092-11/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Store FileInfo::getType() result for future useRobin McCorkell2015-02-091-4/+3
| * | | | | | | | | Performance improvements for NaturalSortRobin McCorkell2015-02-091-7/+10
* | | | | | | | | | Merge pull request #13928 from owncloud/prevent_ghost_files_masterVincent Petry2015-02-091-2/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | for password protected link shares the password is stored in shareWith, so we...Bjoern Schiessle2015-02-051-2/+9
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #13921 from owncloud/ocs-afVincent Petry2015-02-097-7/+406
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \