summaryrefslogtreecommitdiffstats
Commit message (Collapse)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 precissions
| * [Avatars] Calculate 'sane' hue precissionsRoeland Jago Douma2015-12-241-2/+2
|/ | | | | | | | | | We used to get the numeric value of the entrire md5 string which is a 128bit integer. We would then devide this by the maxval of a 128bit int. There is no need for such huge computations. As we just require a value between 0 and 255. Thus using two 16 bit values is more than enough to get the precision we need. By just taking the MSB we get nearly identical results.
* [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 tests
| * Fix unit testsLukas Reschke2015-12-231-6/+6
|/ | | | Fixes https://github.com/owncloud/core/issues/21345
* [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 target="_blank" to href in setupcheck
| * 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 list
| * | Make a modifiable copy of the webdav properties in JS file listVincent Petry2015-12-221-1/+1
|/ / | | | | | | | | | | Plugins can extend _getWebdavProperties to add custom properties. These should not be added to the original properties list, so now the FileList makes a copy of the array.
* | Merge pull request #21287 from owncloud/travis-dav-caldavtesterThomas Müller2015-12-227-5/+3704
|\ \ | | | | | | Adding integration tests for CalDAV
| * | 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 federation handshake
| * | 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 failure
| * Restore DB connection after failureVincent Petry2015-12-211-2/+12
| | | | | | | | | | | | | | | | | | In case of failure, PHPUnit seems to skip `tearDown`, so any useful assertion messages cannot be shown because `tearDownAfterClass` is throwing an error because of database usage. This commit makes sure we also restore the database in `tearDownAfterClass` to prevent the data root restoration to fail
* | Merge pull request #21293 from owncloud/restructure-travis-dav-testingThomas Müller2015-12-218-58/+68
|\ \ | | | | | | Restructure travis tests
| * | 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 carddav sharing plugin + adding unit tests
| * 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 ↵Thomas Müller2015-12-212-3/+9
|\ \ | | | | | | | | | | | | owncloud/issue-20399-keep-periodic-background-jobs Do not delete background jobs, in case an exception occured
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | This approach is not valid anymore. It initially was added for jobs of non existing apps. But jobs of non-existing apps can not be created so they will never be executed and so this call just catches other cases which were not intended. This reverts commit 4f4ad72460f8ef299cd1235b5774c5f121cca430.
* | | Merge pull request #21308 from owncloud/use-new-apcu-apiThomas Müller2015-12-211-2/+99
|\ \ \ | | | | | | | | Use new APCu API
| * | | Use new APCu APILukas Reschke2015-12-201-2/+99
| | | | | | | | | | | | | | | | This one is available since APCu 4.0, since we require APCu 4.0.6 this works fine. Also it brings us PHP 7 compatibility and thus fixes https://github.com/owncloud/core/issues/21095
* | | | [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
|\ \ \ \ | | | | | | | | | | Update README.md
| * \ \ \ 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.0
| * | | | [3rdparty] Bump symfony/process to 2.8.0Roeland Jago Douma2015-12-201-0/+0
|/ / / /
| * / / Update README.mdaspdye2015-12-201-1/+5
|/ / / | | | | | | | | | | | | -Added Facebook into "Get in touch"-section -Improved Emojis on "Get in touch"-section -Added Support Information
* | | [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
|\ \ \ | | | | | | | | Allow background jobs to be service names for DI
| * | | 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 implementation
| * | | 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.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
|\ \ \ \ \ | |_|/ / / |/| | | | Remove deprecated OC_Helper mimetype functions
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Cleanup OC_Config mess
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-26 11:55:22 +0000