summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'fix-5388-master' into migration_unit_teststomneedham2014-01-074-108/+31
|\
| * Merge branch 'master' into fix-5388-mastertomneedham2014-01-04563-7076/+15968
| |\
| * | Fix migration import of user filesBart Visscher2013-12-201-1/+1
| * | Wrap the import/export db in a wrapper to make it compatible with the old styleBart Visscher2013-12-202-0/+4
| * | Merge branch 'master' into fix-5388-masterBart Visscher2013-12-16144-709/+1105
| |\ \
| * \ \ Merge branch 'master' into fix-5388-mastertomneedham2013-12-11900-19907/+33355
| |\ \ \
| * \ \ \ Merge branch 'master' into fix-5388-masterThomas Mueller2013-11-24137-381/+451
| |\ \ \ \
| * | | | | ref 3rdparty branch without MDB2 codeThomas Müller2013-11-221-0/+0
| * | | | | Merge branch 'master' into fix-5388-masterThomas Müller2013-11-2212-24/+162
| |\ \ \ \ \
| * | | | | | Change OC_Migrate from MDB2 to DoctrineBart Visscher2013-11-223-107/+26
* | | | | | | Add WIP unit test for migrationtomneedham2014-01-071-0/+32
* | | | | | | [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
* | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2821-95/+151
| |_|_|/ / / / / / / |/| | | | | | | | |
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2718-72/+84
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2616-79/+115
* | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2517-49/+49
* | | | | | | | | | Merge pull request #6520 from owncloud/tests-testcleanuplistenerThomas Müller2013-12-244-1/+159
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added test cleanup listener to detect untidy testsVincent Petry2013-12-194-1/+159
* | | | | | | | | | | Merge pull request #6449 from owncloud/core-appsorderfixThomas Müller2013-12-244-6/+21
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fixed apps loading orderVincent Petry2013-12-204-6/+21
* | | | | | | | | | | | Merge pull request #6561 from syncloud/masterThomas Müller2013-12-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \