nextcloud-server.git - Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server

	Commit message (Collapse)	Author	Age	Files	Lines
*	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-12-23	66	-280/+2
\|
*	Merge pull request #21318 from ryno83/target_blank_for_links_in_setupcheck	Thomas Müller	2015-12-23	1	-6/+6
\|\ \| \| \| \|	add target="_blank" to href in setupcheck
\| *	add _blank to href	Renaud Fortier	2015-12-21	1	-6/+6
\| \|
* \|	Merge pull request #21325 from owncloud/files-donotduplicatewebdavproperties	Thomas Müller	2015-12-22	1	-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 list	Vincent Petry	2015-12-22	1	-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-caldavtester	Thomas Müller	2015-12-22	7	-5/+3704
\|\ \ \| \| \| \| \| \|	Adding integration tests for CalDAV
\| * \|	Adding integration tests for CalDAV	Thomas Müller	2015-12-21	7	-5/+3704
\| \|/
* \|	Merge pull request #21312 from owncloud/fed-handshake-logging	Thomas Müller	2015-12-22	5	-10/+37
\|\ \ \| \| \| \| \| \|	Add error logging to federation handshake
\| * \|	Add error logging to federated sharing handshake	Robin Appelman	2015-12-21	5	-10/+37
\| \|/
* \|	Merge pull request #21316 from owncloud/tests-fixtestcasetoallowfailure	Thomas Müller	2015-12-21	1	-2/+12
\|\ \ \| \|/ \|/\|	Restore DB connection after failure
\| *	Restore DB connection after failure	Vincent Petry	2015-12-21	1	-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-testing	Thomas Müller	2015-12-21	8	-58/+68
\|\ \ \| \| \| \| \| \|	Restructure travis tests
\| * \|	Sleep in carddavtester as well	Thomas Müller	2015-12-21	1	-0/+2
\| \| \|
\| * \|	Restructure travis tests	Thomas Müller	2015-12-21	8	-58/+66
\| \|/
* \|	Merge pull request #21195 from owncloud/test-carddav-sharing-plugin	Thomas Müller	2015-12-21	5	-64/+167
\|\ \ \| \|/ \|/\|	Fix carddav sharing plugin + adding unit tests
\| *	Fix failing unit tests	Thomas Müller	2015-12-18	1	-1/+1
\| \|
\| *	Fix carddav sharing plugin + adding unit tests	Thomas Müller	2015-12-18	5	-63/+166
\| \|
* \|	Merge pull request #21289 from ↵	Thomas Müller	2015-12-21	2	-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 behaviour	Joas Schilling	2015-12-18	1	-2/+9
\| \| \|
\| * \|	Do not delete background jobs, in case an exception occured	Joas Schilling	2015-12-18	1	-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-api	Thomas Müller	2015-12-21	1	-2/+99
\|\ \ \ \| \| \| \| \| \| \| \|	Use new APCu API
\| * \| \|	Use new APCu API	Lukas Reschke	2015-12-20	1	-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 transifex	Jenkins for ownCloud	2015-12-21	2	-0/+2
\| \| \| \|
* \| \| \|	Merge pull request #21307 from aspdye/patch-1	Thomas Müller	2015-12-20	1	-1/+5
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	Update README.md
\| * \ \ \	Merge branch 'master' into patch-1	aspdye	2015-12-20	1	-0/+0
\| \|\ \ \ \ \| \|/ / / / \|/\| \| \| \|
* \| \| \| \|	Merge pull request #21299 from owncloud/symfony-process-2.8.0	Thomas Müller	2015-12-20	1	-0/+0
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	[3rdparty] Bump symfony/process to 2.8.0
\| * \| \| \|	[3rdparty] Bump symfony/process to 2.8.0	Roeland Jago Douma	2015-12-20	1	-0/+0
\|/ / / /
\| * / /	Update README.md	aspdye	2015-12-20	1	-1/+5
\|/ / / \| \| \| \| \| \| \| \| \| \| \| \|	-Added Facebook into "Get in touch"-section -Improved Emojis on "Get in touch"-section -Added Support Information
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-12-20	8	-0/+8
\| \| \|
* \| \|	[tx-robot] updated from transifex	Jenkins for ownCloud	2015-12-19	10	-4/+16
\| \| \|
* \| \|	Merge pull request #21281 from owncloud/allow-di-for-background-jobs	Thomas Müller	2015-12-18	5	-11/+127
\|\ \ \ \| \| \| \| \| \| \| \|	Allow background jobs to be service names for DI
\| * \| \|	Add methods to interface which have always been required	Joas Schilling	2015-12-18	2	-2/+19
\| \| \| \|
\| * \| \|	Allow dependency injection for background jobs	Joas Schilling	2015-12-18	1	-9/+15
\| \| \| \|
\| * \| \|	Look up services in the app container before trying the core container	Joas Schilling	2015-12-18	1	-0/+24
\| \| \| \|
\| * \| \|	Register app containers in the OC container	Joas Schilling	2015-12-18	3	-1/+70
\| \|/ /
* \| \|	Merge pull request #21290 from owncloud/public-api-usage-getversion	Thomas Müller	2015-12-18	17	-35/+37
\|\ \ \ \| \| \| \| \| \| \| \|	Use OCP\Util::getVersion instead of the internal private implementation
\| * \| \|	Use OCP\Util::getVersion instead of the internal private implementation	Morris Jobke	2015-12-18	17	-35/+37
\| \| \| \|
* \| \| \|	Merge pull request #21272 from owncloud/symfony-routing-2.8.0	Thomas Müller	2015-12-18	1	-0/+0
\|\ \ \ \ \| \| \| \| \| \| \| \| \| \|	[3rdparty] Bump symfony/routing to 2.8.0
\| * \| \| \|	[3rdparty] Bump symfony/routing to 2.8.0	Roeland Jago Douma	2015-12-18	1	-0/+0
\| \| \| \| \|
* \| \| \| \|	Merge pull request #21288 from owncloud/deprecated_helper_mimetypes	Thomas Müller	2015-12-18	9	-79/+10
\|\ \ \ \ \ \| \|_\|/ / / \|/\| \| \| \|	Remove deprecated OC_Helper mimetype functions
\| * \| \| \|	Removed deprecated OC_Helper::mimeTypeIcon function	Roeland Jago Douma	2015-12-18	5	-32/+7
\| \| \| \| \|
\| * \| \| \|	Removed deprecated unsused function OC_Helper::getStringMimeType	Roeland Jago Douma	2015-12-18	2	-21/+0
\| \| \| \| \|
\| * \| \| \|	Removed deprecated OC_Helper::getSecureMimeType	Roeland Jago Douma	2015-12-18	5	-26/+3
\| \| \| \| \|
* \| \| \| \|	Merge pull request #21283 from owncloud/cleanup_config	Thomas Müller	2015-12-18	10	-128/+56
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Cleanup OC_Config mess
\| * \| \| \| \|	Use SystemConfig internally	Roeland Jago Douma	2015-12-18	5	-19/+19
\| \| \| \| \| \|
\| * \| \| \| \|	Inject Config into SystemConfig	Roeland Jago Douma	2015-12-18	5	-15/+32
\| \| \| \| \| \|
\| * \| \| \| \|	Get rid of legacy OC_Config	Roeland Jago Douma	2015-12-18	7	-118/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We were still using the lecagy class OC_Config all over the place. Which was a wrapper around the new class OC\Config
* \| \| \| \| \|	Merge pull request #21280 from owncloud/drop-unused-methods	Thomas Müller	2015-12-18	5	-182/+15
\|\ \ \ \ \ \ \| \|_\|_\|_\|/ / \|/\| \| \| \| \|	OC_Helper::makeURLAbsolute is not used anymore
\| * \| \| \| \|	Move OC_Helper code to OCP\Util for linkToRemote	Morris Jobke	2015-12-18	3	-59/+5
\| \| \| \| \| \|
\| * \| \| \| \|	properly use OCP\Util instead of OC_Helper	Morris Jobke	2015-12-18	5	-69/+10
\| \| \| \| \| \|