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

29209 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Roeland Jago Douma
4f20e3bac0 Removed deprecated OC_Helper::getSecureMimeType 2015-12-18 13:42:59 +01:00
Morris Jobke
450e2f3bd3 Move OC_Helper code to OCP\Util for linkToRemote 2015-12-18 12:00:18 +01:00
Thomas Müller
b4a896c00d Merge pull request #21279 from owncloud/remove-tmp-methods 
Remove unneeded methods in OC_Helper
 2015-12-18 11:58:20 +01:00
Roeland Jago Douma
6fb60815c5 Use SystemConfig internally 2015-12-18 11:53:41 +01:00
Roeland Jago Douma
0a09004d39 Inject Config into SystemConfig 2015-12-18 11:53:41 +01:00
Roeland Jago Douma
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
Morris Jobke
e42f262d85 properly use OCP\Util instead of OC_Helper 2015-12-18 11:46:21 +01:00
Morris Jobke
3d55569a27 OC_Helper::makeURLAbsolute is not used anymore 2015-12-18 11:37:18 +01:00
Morris Jobke
4af7bf07bf OC_Helper::userAvatarSet is not used anymore 2015-12-18 11:30:30 +01:00
Morris Jobke
a18c0983d5 Use TempManager instead of tmpFile 2015-12-18 11:25:33 +01:00
Morris Jobke
90b0831cec Use TempManager instead of tmpFolder 2015-12-18 11:19:53 +01:00
Roeland Jago Douma
4d493beb73 [3rdparty] Bump symfony/routing to 2.8.0 2015-12-18 10:40:47 +01:00
Thomas Müller
6a7dbf3cf2 Merge pull request #21278 from owncloud/exclude-scrutinizer-autofixer 
Exclude scrutinizer-auto-fixer
 2015-12-18 10:29:25 +01:00
Lukas Reschke
ce2aeda9fe Exclude scrutinizer-auto-fixer 2015-12-18 10:27:42 +01:00
Thomas Müller
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
551e553bf4 Merge pull request #21264 from owncloud/deprecated_oc_user_methods 
Cleanup OC_User deprecated methods
 2015-12-18 10:15:18 +01:00
Joas Schilling
0f836cfe9e Make sure the interface and the implementation match 2015-12-18 10:04:30 +01:00
Joas Schilling
345e68cafa Use the query builder for the joblist queries 2015-12-18 09:50:23 +01:00
Thomas Müller
67e9506261 Fix failing unit tests 2015-12-18 09:18:38 +01:00
Thomas Müller
aac06a33f1 Fix carddav sharing plugin + adding unit tests 2015-12-18 09:18:38 +01:00
Thomas Müller
1456e910ad Merge pull request #21269 from owncloud/we-shall-cleanup-xml-parser-errors 
Assert that there are no xml error left
 2015-12-18 09:17:53 +01:00
Thomas Müller
2622116b57 Merge pull request #21190 from owncloud/bump_doctrine_deps 
[3rdparty] Bump doctrine deps
 2015-12-18 08:48:34 +01:00
Thomas Müller
228a75e2ec Merge pull request #21248 from owncloud/deprecated_oc_helper_linkToRoute 
Replace deprecated OC_Helper::linkToRoute calls
 2015-12-18 07:56:42 +01:00
Thomas Müller
d77019f566 Merge pull request #21247 from owncloud/placeholder_size 
Add a default size to the avatar placeholders
 2015-12-18 07:56:23 +01:00