summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #6565 from owncloud/enable-ldap-unit-tests-master-2Thomas Müller2014-01-071-0/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | enable ldap testsThomas Müller2013-12-241-0/+1
* | | | | | Merge pull request #6660 from owncloud/fixing-disabled-function-checksThomas Müller2014-01-073-4/+6
|\ \ \ \ \ \
| * | | | | | trimming all array elementsThomas Müller2014-01-071-1/+3
| * | | | | | we shall explode on ',' onlyThomas Müller2014-01-071-1/+1
| * | | | | | reuse existing helper function OC_Helper::is_function_enabledThomas Müller2014-01-072-2/+2
* | | | | | | Merge pull request #6290 from owncloud/files-androidcontentdispositionThomas Müller2014-01-078-69/+99
|\ \ \ \ \ \ \
| * | | | | | | Added isUserAgent() method to requestVincent Petry2013-12-193-2/+74
| * | | | | | | Added workaround for Android content dispositionVincent Petry2013-12-101-1/+2
| * | | | | | | Moved content disposition code+workarounds to OCP\ResponseVincent Petry2013-12-106-69/+26
* | | | | | | | Merge pull request #6642 from owncloud/update-SabreDAVThomas Müller2014-01-072-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove @ in order to get proper error handlingThomas Müller2014-01-071-1/+1
| * | | | | | | | reference 3rdparty branch with SabreDAV 1.7.9 installed using composerThomas Müller2014-01-051-0/+0
| * | | | | | | | require composer's autoload.php if presentThomas Müller2014-01-051-2/+6
* | | | | | | | | Merge pull request #6663 from owncloud/fix_empty_mimetypesThomas Müller2014-01-071-2/+1
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | remove duplicate exe mimetype, add correct msi mimetypeJörn Friedrich Dreyer2014-01-071-2/+1
* | | | | | | | | Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-...Thomas Müller2014-01-071-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | in order to work properly with encryption ocTransferId is added to the file p...Thomas Müller2014-01-071-1/+1
| * | | | | | | | Adding a random postfix to the part file.Thomas Müller2013-12-201-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-0741-82/+3362
| |_|_|_|_|_|_|/ |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-0632-164/+214
* | | | | | | | Merge pull request #6031 from s0taka/masterMorris Jobke2014-01-052-2/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | spaces to tabsSimon Könnecke2013-12-181-1/+1
| * | | | | | | No decimal points for Kilobyte and Byte #5371.Simon Könnecke2013-11-252-2/+5
* | | | | | | | Merge pull request #6580 from monreal/masterThomas Müller2014-01-051-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Silence output of 'which' command used in smbclient detectionMichael Monreal2013-12-271-1/+1
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-0532-154/+203
* | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-0425-46/+51
* | | | | | | | | Merge pull request #6610 from owncloud/apcu-clearicewind19912014-01-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix APCIterator syntax in \OC\Memcache\APCU::clearRobin Appelman2014-01-021-1/+1
* | | | | | | | | | Merge pull request #6605 from owncloud/free_space_disabledThomas Müller2014-01-021-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free spa...Robin Appelman2014-01-021-1/+1
* | | | | | | | | | | Merge pull request #6609 from owncloud/avatar-test-userThomas Müller2014-01-021-5/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Make OC_Avatar unit tests independent of currently loggedin userRobin Appelman2014-01-021-5/+13
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #6513 from owncloud/user-no-change-displaynameicewind19912014-01-024-15/+54
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Pass config object in testGetHomeNotSupportedRobin Appelman2013-12-201-1/+4
| * | | | | | | | | Merge branch 'master' into user-no-change-displaynameRobin Appelman2013-12-19137-597/+1550
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replace static usage of OC_Config and OC_Preferences with the injected \OC\Co...Robin Appelman2013-12-181-5/+13
| * | | | | | | | | | fix the config option to remove the ability for users to set their displaynameRobin Appelman2013-12-183-9/+37
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-01-0240-852/+1545
* | | | | | | | | | | Merge pull request #6601 from AdamWill/pimple-includeThomas Müller2014-01-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | don't specify path to 3rdparty directory when registering Pimple autoloaderAdam Williamson2014-01-011-1/+1
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #6598 from lolozere/masterThomas Müller2014-01-011-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add support mimetypelolozere2014-01-011-0/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Revert "Added support for extra backends (see pull request #5043)"Niklas Sombert2014-01-011-2/+0
* | | | | | | | | | | Added support for extra backends (see pull request #5043)Niklas Sombert2014-01-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Added support for extra backendselchi2013-09-301-0/+2
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-3120-181/+263
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-3028-14/+3290
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2928-309/+472