summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fix-5388-mastertomneedham2014-01-04563-7076/+15968
|\
| * [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
| |\ \ \ \ \ \
| | * | | | | | Made password field required on client sideVladimir Sapronov2013-12-221-1/+1
| * | | | | | | Merge pull request #6554 from owncloud/fix_5982Thomas Müller2013-12-241-1/+3
| |\ \ \ \ \ \ \
| | * | | | | | | fix preview for reshared fileGeorg Ehrke2013-12-221-1/+3
| | |/ / / / / /
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2442-267/+326
| * | | | | | | Merge pull request #6460 from owncloud/remove-numRowsFrank Karlitschek2013-12-234-33/+13
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Remove all uses of numRows().Andreas Fischer2013-12-213-14/+13
| | * | | | | | Remove OC_DB_StatementWrapper::numRows().Andreas Fischer2013-12-211-19/+0
| * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-2231-116/+182
| |/ / / / / /
| * / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-12-2122-59/+77
| |/ / / / /
| * | | | | Merge pull request #6262 from nickvergessen/issue/4375Frank Karlitschek2013-12-202-1/+2
| |\ \ \ \ \
| | * | | | | correctly mark app management activeJoas Schilling2013-12-092-1/+2
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-12-20294-2303/+2319
| * | | | | | Merge pull request #6507 from owncloud/enc_fix_getUserBjörn Schießle2013-12-193-1/+44
| |\ \ \ \ \ \
| | * | | | | | tests addedBjoern Schiessle2013-12-193-1/+44
| | * | | | | | we can also have a path user/cache/...Bjoern Schiessle2013-12-191-1/+1
| | | |_|_|_|/ | | |/| | | |
| * | | | | | Merge pull request #6517 from owncloud/fix_6510Björn Schießle2013-12-192-19/+45
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| | * | | | | check if the old owner and the old path is availableBjoern Schiessle2013-12-191-3/+10