Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'fix-5388-master' into migration_unit_tests | tomneedham | 2014-01-07 | 4 | -108/+31 |
|\ | |||||
| * | Merge branch 'master' into fix-5388-master | tomneedham | 2014-01-04 | 563 | -7076/+15968 |
| |\ | |||||
| * | | Fix migration import of user files | Bart Visscher | 2013-12-20 | 1 | -1/+1 |
| * | | Wrap the import/export db in a wrapper to make it compatible with the old style | Bart Visscher | 2013-12-20 | 2 | -0/+4 |
| * | | Merge branch 'master' into fix-5388-master | Bart Visscher | 2013-12-16 | 144 | -709/+1105 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' into fix-5388-master | tomneedham | 2013-12-11 | 900 | -19907/+33355 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into fix-5388-master | Thomas Mueller | 2013-11-24 | 137 | -381/+451 |
| |\ \ \ \ | |||||
| * | | | | | ref 3rdparty branch without MDB2 code | Thomas Müller | 2013-11-22 | 1 | -0/+0 |
| * | | | | | Merge branch 'master' into fix-5388-master | Thomas Müller | 2013-11-22 | 12 | -24/+162 |
| |\ \ \ \ \ | |||||
| * | | | | | | Change OC_Migrate from MDB2 to Doctrine | Bart Visscher | 2013-11-22 | 3 | -107/+26 |
* | | | | | | | Add WIP unit test for migration | tomneedham | 2014-01-07 | 1 | -0/+32 |
* | | | | | | | [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 |
* | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-28 | 21 | -95/+151 |
| |_|_|/ / / / / / / |/| | | | | | | | | | |||||
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-27 | 18 | -72/+84 |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-26 | 16 | -79/+115 |
* | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-12-25 | 17 | -49/+49 |
* | | | | | | | | | | Merge pull request #6520 from owncloud/tests-testcleanuplistener | Thomas Müller | 2013-12-24 | 4 | -1/+159 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | Added test cleanup listener to detect untidy tests | Vincent Petry | 2013-12-19 | 4 | -1/+159 |
* | | | | | | | | | | | Merge pull request #6449 from owncloud/core-appsorderfix | Thomas Müller | 2013-12-24 | 4 | -6/+21 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed apps loading order | Vincent Petry | 2013-12-20 | 4 | -6/+21 |
* | | | | | | | | | | | | Merge pull request #6561 from syncloud/master | Thomas Müller | 2013-12-24 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ |