Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Merge pull request #6565 from owncloud/enable-ldap-unit-tests-master-2 | Thomas Müller | 2014-01-07 | 1 | -0/+1 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | enable ldap tests | Thomas Müller | 2013-12-24 | 1 | -0/+1 | |
* | | | | | | Merge pull request #6660 from owncloud/fixing-disabled-function-checks | Thomas Müller | 2014-01-07 | 3 | -4/+6 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | trimming all array elements | Thomas Müller | 2014-01-07 | 1 | -1/+3 | |
| * | | | | | | we shall explode on ',' only | Thomas Müller | 2014-01-07 | 1 | -1/+1 | |
| * | | | | | | reuse existing helper function OC_Helper::is_function_enabled | Thomas Müller | 2014-01-07 | 2 | -2/+2 | |
* | | | | | | | Merge pull request #6290 from owncloud/files-androidcontentdisposition | Thomas Müller | 2014-01-07 | 8 | -69/+99 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Added isUserAgent() method to request | Vincent Petry | 2013-12-19 | 3 | -2/+74 | |
| * | | | | | | | Added workaround for Android content disposition | Vincent Petry | 2013-12-10 | 1 | -1/+2 | |
| * | | | | | | | Moved content disposition code+workarounds to OCP\Response | Vincent Petry | 2013-12-10 | 6 | -69/+26 | |
* | | | | | | | | Merge pull request #6642 from owncloud/update-SabreDAV | Thomas Müller | 2014-01-07 | 2 | -2/+6 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove @ in order to get proper error handling | Thomas Müller | 2014-01-07 | 1 | -1/+1 | |
| * | | | | | | | | reference 3rdparty branch with SabreDAV 1.7.9 installed using composer | Thomas Müller | 2014-01-05 | 1 | -0/+0 | |
| * | | | | | | | | require composer's autoload.php if present | Thomas Müller | 2014-01-05 | 1 | -2/+6 | |
* | | | | | | | | | Merge pull request #6663 from owncloud/fix_empty_mimetypes | Thomas Müller | 2014-01-07 | 1 | -2/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | remove duplicate exe mimetype, add correct msi mimetype | Jörn Friedrich Dreyer | 2014-01-07 | 1 | -2/+1 | |
* | | | | | | | | | Merge pull request #6530 from owncloud/prevent-corruption-on-parallel-upload-... | Thomas Müller | 2014-01-07 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | in order to work properly with encryption ocTransferId is added to the file p... | Thomas Müller | 2014-01-07 | 1 | -1/+1 | |
| * | | | | | | | | Adding a random postfix to the part file. | Thomas Müller | 2013-12-20 | 1 | -1/+1 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-07 | 41 | -82/+3362 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | ||||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-06 | 32 | -164/+214 | |
* | | | | | | | | Merge pull request #6031 from s0taka/master | Morris Jobke | 2014-01-05 | 2 | -2/+5 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | spaces to tabs | Simon Könnecke | 2013-12-18 | 1 | -1/+1 | |
| * | | | | | | | No decimal points for Kilobyte and Byte #5371. | Simon Könnecke | 2013-11-25 | 2 | -2/+5 | |
* | | | | | | | | Merge pull request #6580 from monreal/master | Thomas Müller | 2014-01-05 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Silence output of 'which' command used in smbclient detection | Michael Monreal | 2013-12-27 | 1 | -1/+1 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-05 | 32 | -154/+203 | |
* | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-04 | 25 | -46/+51 | |
* | | | | | | | | | Merge pull request #6610 from owncloud/apcu-clear | icewind1991 | 2014-01-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix APCIterator syntax in \OC\Memcache\APCU::clear | Robin Appelman | 2014-01-02 | 1 | -1/+1 | |
* | | | | | | | | | | Merge pull request #6605 from owncloud/free_space_disabled | Thomas Müller | 2014-01-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Return SPACE_UNKNOWN if disk_free_space is disabled when getting the free spa... | Robin Appelman | 2014-01-02 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #6609 from owncloud/avatar-test-user | Thomas Müller | 2014-01-02 | 1 | -5/+13 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Make OC_Avatar unit tests independent of currently loggedin user | Robin Appelman | 2014-01-02 | 1 | -5/+13 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #6513 from owncloud/user-no-change-displayname | icewind1991 | 2014-01-02 | 4 | -15/+54 | |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Pass config object in testGetHomeNotSupported | Robin Appelman | 2013-12-20 | 1 | -1/+4 | |
| * | | | | | | | | | Merge branch 'master' into user-no-change-displayname | Robin Appelman | 2013-12-19 | 137 | -597/+1550 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Replace static usage of OC_Config and OC_Preferences with the injected \OC\Co... | Robin Appelman | 2013-12-18 | 1 | -5/+13 | |
| * | | | | | | | | | | fix the config option to remove the ability for users to set their displayname | Robin Appelman | 2013-12-18 | 3 | -9/+37 | |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-01-02 | 40 | -852/+1545 | |
* | | | | | | | | | | | Merge pull request #6601 from AdamWill/pimple-include | Thomas Müller | 2014-01-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | don't specify path to 3rdparty directory when registering Pimple autoloader | Adam Williamson | 2014-01-01 | 1 | -1/+1 | |
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #6598 from lolozere/master | Thomas Müller | 2014-01-01 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | Add support mimetype | lolozere | 2014-01-01 | 1 | -0/+3 | |
|/ / / / / / / / / / / | ||||||
* | | | | | | | | | | | Revert "Added support for extra backends (see pull request #5043)" | Niklas Sombert | 2014-01-01 | 1 | -2/+0 | |
* | | | | | | | | | | | Added support for extra backends (see pull request #5043) | Niklas Sombert | 2014-01-01 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Added support for extra backends | elchi | 2013-09-30 | 1 | -0/+2 | |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-31 | 20 | -181/+263 | |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-30 | 28 | -14/+3290 | |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-29 | 28 | -309/+472 |