152e72c4fc
Merge pull request #21312 from owncloud/fed-handshake-logging
...
Add error logging to federation handshake
2015-12-22 09:29:54 +01:00
6b1cb44cb1
Merge pull request #21316 from owncloud/tests-fixtestcasetoallowfailure
...
Restore DB connection after failure
2015-12-21 18:53:35 +01:00
d7169ffdec
Restore DB connection after failure
...
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
2015-12-21 18:14:29 +01:00
ef9a231f6c
Add error logging to federated sharing handshake
2015-12-21 16:37:54 +01:00
38a006b1e8
Merge pull request #21293 from owncloud/restructure-travis-dav-testing
...
Restructure travis tests
2015-12-21 12:07:21 +01:00
ac78d248b7
Sleep in carddavtester as well
2015-12-21 11:43:15 +01:00
40d796dde9
Merge pull request #21195 from owncloud/test-carddav-sharing-plugin
...
Fix carddav sharing plugin + adding unit tests
2015-12-21 11:40:03 +01:00
0b597c37b3
Restructure travis tests
2015-12-21 11:35:48 +01:00
0b913f00c7
Merge pull request #21289 from owncloud/issue-20399-keep-periodic-background-jobs
...
Do not delete background jobs, in case an exception occured
2015-12-21 09:47:07 +01:00
a635975d19
Merge pull request #21308 from owncloud/use-new-apcu-api
...
Use new APCu API
2015-12-21 09:25:15 +01:00
bc25015bf9
[tx-robot] updated from transifex
2015-12-21 01:55:07 -05:00
e8cadbc4e6
Merge pull request #21307 from aspdye/patch-1
...
Update README.md
2015-12-20 17:20:16 +01:00
27695b74bd
Merge branch 'master' into patch-1
2015-12-20 14:26:55 +01:00
2263a611f7
Merge pull request #21299 from owncloud/symfony-process-2.8.0
...
[3rdparty] Bump symfony/process to 2.8.0
2015-12-20 13:36:22 +01:00
2c4b9e03e0
Use new APCu API
...
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
2015-12-20 11:09:09 +01:00
ade7243299
[3rdparty] Bump symfony/process to 2.8.0
2015-12-20 10:37:57 +01:00
68a6057049
Update README.md
...
-Added Facebook into "Get in touch"-section
-Improved Emojis on "Get in touch"-section
-Added Support Information
2015-12-20 10:33:14 +01:00
7080594670
[tx-robot] updated from transifex
2015-12-20 01:55:09 -05:00
d0cb4c9ab3
[tx-robot] updated from transifex
2015-12-19 01:55:14 -05:00
95a255b0d4
Merge pull request #21281 from owncloud/allow-di-for-background-jobs
...
Allow background jobs to be service names for DI
2015-12-18 16:34:42 +01:00
6cdaf754b2
Merge pull request #21290 from owncloud/public-api-usage-getversion
...
Use OCP\Util::getVersion instead of the internal private implementation
2015-12-18 16:07:01 +01:00
ed98cdf532
Use OCP\Util::getVersion instead of the internal private implementation
2015-12-18 15:26:54 +01:00
52eeba1bb9
Merge pull request #21272 from owncloud/symfony-routing-2.8.0
...
[3rdparty] Bump symfony/routing to 2.8.0
2015-12-18 15:25:12 +01:00
36cc0528e3
Merge pull request #21288 from owncloud/deprecated_helper_mimetypes
...
Remove deprecated OC_Helper mimetype functions
2015-12-18 15:23:05 +01:00
54558bb5b2
Fix the test to expect the new behaviour
2015-12-18 15:05:32 +01:00
a743047e82
Merge pull request #21283 from owncloud/cleanup_config
...
Cleanup OC_Config mess
2015-12-18 14:54:38 +01:00
50e8773307
Merge pull request #21280 from owncloud/drop-unused-methods
...
OC_Helper::makeURLAbsolute is not used anymore
2015-12-18 14:49:55 +01:00
6b813f56c9
Do not delete background jobs, in case an exception occured
...
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 4f4ad72460
2015-12-18 14:31:27 +01:00
a9935bd490
Add methods to interface which have always been required
2015-12-18 14:25:04 +01:00
0daed65e14
Allow dependency injection for background jobs
2015-12-18 14:20:30 +01:00
b460bde7c6
Removed deprecated OC_Helper::mimeTypeIcon function
2015-12-18 14:00:20 +01:00
1f197134c8
Look up services in the app container before trying the core container
2015-12-18 13:45:07 +01:00
412e4ed3f6
Register app containers in the OC container
2015-12-18 13:45:07 +01:00
22d1b1285e
Merge pull request #21277 from owncloud/querybuild-joblist
...
Use the query builder for the joblist queries
2015-12-18 13:44:02 +01:00
a54be132fc
Removed deprecated unsused function OC_Helper::getStringMimeType
2015-12-18 13:43:44 +01:00
4f20e3bac0
Removed deprecated OC_Helper::getSecureMimeType
2015-12-18 13:42:59 +01:00
450e2f3bd3
Move OC_Helper code to OCP\Util for linkToRemote
2015-12-18 12:00:18 +01:00
b4a896c00d
Merge pull request #21279 from owncloud/remove-tmp-methods
...
Remove unneeded methods in OC_Helper
2015-12-18 11:58:20 +01:00
6fb60815c5
Use SystemConfig internally
2015-12-18 11:53:41 +01:00
0a09004d39
Inject Config into SystemConfig
2015-12-18 11:53:41 +01:00
82bf99c0cf
Get rid of legacy OC_Config
...
We were still using the lecagy class OC_Config all over the place. Which
was a wrapper around the new class OC\Config
2015-12-18 11:53:41 +01:00
e42f262d85
properly use OCP\Util instead of OC_Helper
2015-12-18 11:46:21 +01:00
3d55569a27
OC_Helper::makeURLAbsolute is not used anymore
2015-12-18 11:37:18 +01:00
4af7bf07bf
OC_Helper::userAvatarSet is not used anymore
2015-12-18 11:30:30 +01:00
a18c0983d5
Use TempManager instead of tmpFile
2015-12-18 11:25:33 +01:00
90b0831cec
Use TempManager instead of tmpFolder
2015-12-18 11:19:53 +01:00
4d493beb73
[3rdparty] Bump symfony/routing to 2.8.0
2015-12-18 10:40:47 +01:00
6a7dbf3cf2
Merge pull request #21278 from owncloud/exclude-scrutinizer-autofixer
...
Exclude scrutinizer-auto-fixer
2015-12-18 10:29:25 +01:00
ce2aeda9fe
Exclude scrutinizer-auto-fixer
2015-12-18 10:27:42 +01:00
9e97bef935
Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType
...
Use proper public API for OC_Helper::getFileNameMimeType
2015-12-18 10:15:33 +01:00
Thomas Müller
Vincent Petry
Robin Appelman
Jenkins for ownCloud
aspdye
Lukas Reschke
Roeland Jago Douma
Morris Jobke
Joas Schilling