aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Correct mailmap for Robin McCorkell to robin@mccorkell.me.ukRobin McCorkell2015-12-241-1/+2
* Merge pull request #21323 from owncloud/placeholder_sane_precissionRoeland Douma2015-12-241-2/+2
|\
| * [Avatars] Calculate 'sane' hue precissionsRoeland Jago Douma2015-12-241-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-2410-0/+56
* Merge pull request #21347 from owncloud/fix-unit-tests-on-masterThomas Müller2015-12-231-6/+6
|\
| * Fix unit testsLukas Reschke2015-12-231-6/+6
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-12-2366-280/+2
* Merge pull request #21318 from ryno83/target_blank_for_links_in_setupcheckThomas Müller2015-12-231-6/+6
|\
| * add _blank to hrefRenaud Fortier2015-12-211-6/+6
* | Merge pull request #21325 from owncloud/files-donotduplicatewebdavpropertiesThomas Müller2015-12-221-1/+1
|\ \
| * | Make a modifiable copy of the webdav properties in JS file listVincent Petry2015-12-221-1/+1
|/ /
* | Merge pull request #21287 from owncloud/travis-dav-caldavtesterThomas Müller2015-12-227-5/+3704
|\ \
| * | Adding integration tests for CalDAVThomas Müller2015-12-217-5/+3704
| |/
* | Merge pull request #21312 from owncloud/fed-handshake-loggingThomas Müller2015-12-225-10/+37
|\ \
| * | Add error logging to federated sharing handshakeRobin Appelman2015-12-215-10/+37
| |/
* | Merge pull request #21316 from owncloud/tests-fixtestcasetoallowfailureThomas Müller2015-12-211-2/+12
|\ \ | |/ |/|
| * Restore DB connection after failureVincent Petry2015-12-211-2/+12
* | Merge pull request #21293 from owncloud/restructure-travis-dav-testingThomas Müller2015-12-218-58/+68
|\ \
| * | Sleep in carddavtester as wellThomas Müller2015-12-211-0/+2
| * | Restructure travis testsThomas Müller2015-12-218-58/+66
| |/
* | Merge pull request #21195 from owncloud/test-carddav-sharing-pluginThomas Müller2015-12-215-64/+167
|\ \ | |/ |/|
| * Fix failing unit testsThomas Müller2015-12-181-1/+1
| * Fix carddav sharing plugin + adding unit testsThomas Müller2015-12-185-63/+166
* | Merge pull request #21289 from owncloud/issue-20399-keep-periodic-background-...Thomas Müller2015-12-212-3/+9
|\ \
| * | Fix the test to expect the new behaviourJoas Schilling2015-12-181-2/+9
| * | Do not delete background jobs, in case an exception occuredJoas Schilling2015-12-181-1/+0
* | | Merge pull request #21308 from owncloud/use-new-apcu-apiThomas Müller2015-12-211-2/+99
|\ \ \
| * | | Use new APCu APILukas Reschke2015-12-201-2/+99
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-212-0/+2
* | | | Merge pull request #21307 from aspdye/patch-1Thomas Müller2015-12-201-1/+5
|\ \ \ \
| * \ \ \ Merge branch 'master' into patch-1aspdye2015-12-201-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #21299 from owncloud/symfony-process-2.8.0Thomas Müller2015-12-201-0/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [3rdparty] Bump symfony/process to 2.8.0Roeland Jago Douma2015-12-201-0/+0
|/ / / /
| * / / Update README.mdaspdye2015-12-201-1/+5
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-208-0/+8
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-12-1910-4/+16
* | | Merge pull request #21281 from owncloud/allow-di-for-background-jobsThomas Müller2015-12-185-11/+127
|\ \ \
| * | | Add methods to interface which have always been requiredJoas Schilling2015-12-182-2/+19
| * | | Allow dependency injection for background jobsJoas Schilling2015-12-181-9/+15
| * | | Look up services in the app container before trying the core containerJoas Schilling2015-12-181-0/+24
| * | | Register app containers in the OC containerJoas Schilling2015-12-183-1/+70
| |/ /
* | | Merge pull request #21290 from owncloud/public-api-usage-getversionThomas Müller2015-12-1817-35/+37
|\ \ \
| * | | Use OCP\Util::getVersion instead of the internal private implementationMorris Jobke2015-12-1817-35/+37
* | | | Merge pull request #21272 from owncloud/symfony-routing-2.8.0Thomas Müller2015-12-181-0/+0
|\ \ \ \
| * | | | [3rdparty] Bump symfony/routing to 2.8.0Roeland Jago Douma2015-12-181-0/+0
* | | | | Merge pull request #21288 from owncloud/deprecated_helper_mimetypesThomas Müller2015-12-189-79/+10
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Removed deprecated OC_Helper::mimeTypeIcon functionRoeland Jago Douma2015-12-185-32/+7
| * | | | Removed deprecated unsused function OC_Helper::getStringMimeTypeRoeland Jago Douma2015-12-182-21/+0
| * | | | Removed deprecated OC_Helper::getSecureMimeTypeRoeland Jago Douma2015-12-185-26/+3
* | | | | Merge pull request #21283 from owncloud/cleanup_configThomas Müller2015-12-1810-128/+56
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-26 16:42:05 +0000