wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
29183 commits 157 branches 562 tags 714 MiB
Commit graph

29183 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
9be43e10af Since the server no longer calculates the icon 
The server no longer calculates the icon. So we have the js side do it
for us.
 2015-12-24 08:59:32 +01:00
Jenkins for ownCloud
9cdc3f0558 [tx-robot] updated from transifex 2015-12-24 01:55:14 -05:00
Thomas Müller
1b369870f2 Merge pull request #21347 from owncloud/fix-unit-tests-on-master 
Fix unit tests
 2015-12-23 10:11:18 +01:00
Lukas Reschke
cebeb0e052 Fix unit tests 
Fixes https://github.com/owncloud/core/issues/21345
 2015-12-23 09:11:22 +01:00
Jenkins for ownCloud
726f7e5fa8 [tx-robot] updated from transifex 2015-12-23 02:02:31 -05:00
Thomas Müller
fe262ab522 Merge pull request #21318 from ryno83/target_blank_for_links_in_setupcheck 
add target="_blank" to href in setupcheck
 2015-12-23 07:26:15 +01:00
Christian Schnidrig
7fce06b3f3 When microtime(true) returns a whole number, then the parsing fails. 
This patch makes sure, that the value can always be parsed correctly.
 2015-12-22 15:06:32 +01:00
Thomas Müller
5e3710d746 Merge pull request #21325 from owncloud/files-donotduplicatewebdavproperties 
Make a modifiable copy of the webdav properties in JS file list
 2015-12-22 12:16:26 +01:00
Vincent Petry
ca14277fca Make a modifiable copy of the webdav properties in JS file list 
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.
 2015-12-22 11:17:24 +01:00
Thomas Müller
d17c2fb8d9 Merge pull request #21287 from owncloud/travis-dav-caldavtester 
Adding integration tests for CalDAV
 2015-12-22 10:52:54 +01:00
Morris Jobke
6f00729124 Refactor OC_Util::callCheck 2015-12-22 09:32:14 +01:00
Thomas Müller
152e72c4fc Merge pull request #21312 from owncloud/fed-handshake-logging 
Add error logging to federation handshake
 2015-12-22 09:29:54 +01:00
Renaud Fortier
83899a5fa1 add _blank to href 2015-12-21 13:28:32 -05:00
Thomas Müller
6b1cb44cb1 Merge pull request #21316 from owncloud/tests-fixtestcasetoallowfailure 
Restore DB connection after failure
 2015-12-21 18:53:35 +01:00
Vincent Petry
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
Robin Appelman
ef9a231f6c Add error logging to federated sharing handshake 2015-12-21 16:37:54 +01:00
Thomas Müller
d3883ca9d4 Adding integration tests for CalDAV 2015-12-21 16:04:27 +01:00
Thomas Müller
38a006b1e8 Merge pull request #21293 from owncloud/restructure-travis-dav-testing 
Restructure travis tests
 2015-12-21 12:07:21 +01:00
Thomas Müller
ac78d248b7 Sleep in carddavtester as well 2015-12-21 11:43:15 +01:00
Thomas Müller
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
Thomas Müller
0b597c37b3 Restructure travis tests 2015-12-21 11:35:48 +01:00
Thomas Müller
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
Thomas Müller
a635975d19 Merge pull request #21308 from owncloud/use-new-apcu-api 
Use new APCu API
 2015-12-21 09:25:15 +01:00
Jenkins for ownCloud
bc25015bf9 [tx-robot] updated from transifex 2015-12-21 01:55:07 -05:00
Thomas Müller
e8cadbc4e6 Merge pull request #21307 from aspdye/patch-1 
Update README.md
 2015-12-20 17:20:16 +01:00
aspdye
27695b74bd Merge branch 'master' into patch-1 2015-12-20 14:26:55 +01:00
Thomas Müller
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
Lukas Reschke
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
Roeland Jago Douma
ade7243299 [3rdparty] Bump symfony/process to 2.8.0 2015-12-20 10:37:57 +01:00
aspdye
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
Jenkins for ownCloud
7080594670 [tx-robot] updated from transifex 2015-12-20 01:55:09 -05:00
Jenkins for ownCloud
d0cb4c9ab3 [tx-robot] updated from transifex 2015-12-19 01:55:14 -05:00
Vincent Petry
7ecb9696ba Use showBusyState for upload into folder 
This makes sure that the original icon will be restored properly in case
it's not the default folder icon
 2015-12-18 18:09:54 +01:00
Vincent Petry
d27826bac0 Correctly render uploadtext indicator only on folders 2015-12-18 18:09:46 +01:00
Thomas Müller
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
Thomas Müller
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
Morris Jobke
ed98cdf532 Use OCP\Util::getVersion instead of the internal private implementation 2015-12-18 15:26:54 +01:00
Thomas Müller
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
Thomas Müller
36cc0528e3 Merge pull request #21288 from owncloud/deprecated_helper_mimetypes 
Remove deprecated OC_Helper mimetype functions
 2015-12-18 15:23:05 +01:00
Joas Schilling
54558bb5b2 Fix the test to expect the new behaviour 2015-12-18 15:05:32 +01:00
Thomas Müller
a743047e82 Merge pull request #21283 from owncloud/cleanup_config 
Cleanup OC_Config mess
 2015-12-18 14:54:38 +01:00
Thomas Müller
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
Joas Schilling
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
Joas Schilling
a9935bd490 Add methods to interface which have always been required 2015-12-18 14:25:04 +01:00
Joas Schilling
0daed65e14 Allow dependency injection for background jobs 2015-12-18 14:20:30 +01:00
Roeland Jago Douma
b460bde7c6 Removed deprecated OC_Helper::mimeTypeIcon function 2015-12-18 14:00:20 +01:00
Joas Schilling
1f197134c8 Look up services in the app container before trying the core container 2015-12-18 13:45:07 +01:00
Joas Schilling
412e4ed3f6 Register app containers in the OC container 2015-12-18 13:45:07 +01:00
Thomas Müller
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
Roeland Jago Douma
a54be132fc Removed deprecated unsused function OC_Helper::getStringMimeType 2015-12-18 13:43:44 +01:00