summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Clean-up of orthography, grammarChristian Hoffmann2015-05-191-2/+2
* Merge pull request #16447 from owncloud/fix-minor-code-problemsThomas Müller2015-05-192-2/+2
|\
| * Fix unexisting class and broken docJoas Schilling2015-05-192-2/+2
* | Merge pull request #16419 from owncloud/user-group-backend-performanceThomas Müller2015-05-192-11/+47
|\ \
| * | Reduce the complexity of the search queries in the backends to a minimumJoas Schilling2015-05-182-11/+47
* | | Merge pull request #15606 from owncloud/fix-group-list-and-count-primary-grou...Thomas Müller2015-05-192-9/+78
|\ \ \ | |_|/ |/| |
| * | add primary group users to resultset before cachingArthur Schiwon2015-05-191-1/+2
| * | Fixes returns of group memberships and counting if all members have the speci...Arthur Schiwon2015-05-192-9/+77
* | | Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewithThomas Müller2015-05-192-4/+6
|\ \ \
| * | | add support for limit request parameter to getShareWithCraig Morrissey2015-05-152-4/+6
* | | | Merge pull request #16420 from owncloud/update-useconfigtableprefixMorris Jobke2015-05-191-1/+28
|\ \ \ \
| * | | | Add unit test for migrator with different prefixVincent Petry2015-05-191-1/+28
* | | | | Merge pull request #15965 from owncloud/conditional-loggingThomas Müller2015-05-196-50/+156
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Conditional loggingMorris Jobke2015-05-083-7/+113
| * | | | Move log level check to logger parent classMorris Jobke2015-05-084-45/+45
* | | | | Merge pull request #16085 from owncloud/encryption-module-renameThomas Müller2015-05-195-6/+6
|\ \ \ \ \
| * | | | | rename to 'Default encryption module'Jan-Christoph Borchardt2015-05-065-6/+6
* | | | | | Merge pull request #16354 from owncloud/remove-browser-from-publicwebdavJoas Schilling2015-05-191-1/+2
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Show a empty response for GET on non-files instead of the Browser PluginLukas Reschke2015-05-141-1/+2
* | | | | | Merge pull request #16181 from owncloud/fix-15982Morris Jobke2015-05-196-14/+78
|\ \ \ \ \ \
| * | | | | | handle unallowed auth exception on port detectionArthur Schiwon2015-05-182-6/+20
| * | | | | | throw exception on LDAP error 1, which we usually do not see and is pretty ge...Arthur Schiwon2015-05-183-0/+25
| * | | | | | catch unallowed anonymous auth attempt and show specific errorArthur Schiwon2015-05-185-9/+34
* | | | | | | Merge pull request #16293 from owncloud/xcacheMorris Jobke2015-05-191-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Mute XCache error when trying to clear the opcode cacheLukas Reschke2015-05-121-1/+1
* | | | | | | | Merge pull request #16426 from owncloud/add-database-setup-hintMorris Jobke2015-05-193-1/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Add hint about additional PHP database modulesMorris Jobke2015-05-183-1/+11
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-05-192-0/+2
* | | | | | | | Merge pull request #16412 from owncloud/jknockaert-patch-1Björn Schießle2015-05-182-3/+11
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | add a unit test to make sure that we don't try to read a file during a write ...Bjoern Schiessle2015-05-181-2/+10
| * | | | | | | fix #16356jknockaert2015-05-181-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #16405 from owncloud/enc_add_missing_parameterJoas Schilling2015-05-183-4/+31
|\ \ \ \ \ \ \
| * | | | | | | Add missing import for the exceptionJoas Schilling2015-05-182-0/+3
| * | | | | | | Add a unit test for the decrypt methodJoas Schilling2015-05-181-1/+11
| * | | | | | | add l10n to constructorBjoern Schiessle2015-05-183-4/+18
| |/ / / / / /
* | | | | | | Merge pull request #16399 from owncloud/enc_rmdir_fixClark Tomlinson2015-05-182-9/+80
|\ \ \ \ \ \ \
| * | | | | | | only try to delete file keys if it is a valid pathBjoern Schiessle2015-05-182-9/+80
* | | | | | | | Merge pull request #16403 from owncloud/fix-command-loadingThomas Müller2015-05-181-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Only load commands of enabled appsMorris Jobke2015-05-181-1/+1
* | | | | | | | Merge pull request #15980 from owncloud/jknockaert-patch-1Björn Schießle2015-05-182-19/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | correct testSeekjknockaert2015-05-181-4/+4
| * | | | | | | | work on testsjknockaert2015-05-181-10/+11
| * | | | | | | | fix #15973jknockaert2015-04-301-9/+7
* | | | | | | | | Merge pull request #16404 from owncloud/enc_encrypt_files_in_trashVincent Petry2015-05-182-1/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | also encrypt files in trash binBjoern Schiessle2015-05-182-1/+29
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #16398 from owncloud/fix-php-docv8.1.0beta2Joas Schilling2015-05-181-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix PHPDoc of public interface ILockingProviderMorris Jobke2015-05-181-1/+1
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #16243 from owncloud/error_if_download_failedVincent Petry2015-05-1814-56/+208
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | a new approach to display the error messageBjoern Schiessle2015-05-1814-56/+208
| |/ / / / / / /
* | | | | | | | Merge pull request #16364 from owncloud/add-warning-webdavMorris Jobke2015-05-182-3/+80
|\ \ \ \ \ \ \ \