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

10730 commits

Author SHA1 Message Date
Thomas Müller
f6f492ba4e Merge pull request #21502 from owncloud/di_mimetypedetector 
Add 'OCP\Files\IMimeTypeDetector' to DI container
 2016-01-07 16:18:55 +01:00
Thomas Müller
9ca670f94f Merge pull request #21505 from owncloud/allow-downgrades-for-brave-developers 
Allow downgrades for our brave developers, that switch between branches
 2016-01-07 16:03:36 +01:00
Thomas Müller
601457d221 Merge pull request #20773 from owncloud/share2.0_create 
[Sharing 2.0] create share
 2016-01-07 14:57:05 +01:00
Joas Schilling
fd7ed93937 Allow downgrades for our brave developers, that switch between branches 2016-01-07 14:18:33 +01:00
Roeland Jago Douma
cd35ad6aaa Add 'OCP\Files\IMimeTypeDetector' to DI container 
* Added test to server container as well
 2016-01-07 13:20:43 +01:00
Morris Jobke
604897945b Move lib/repair to lib/private/repair 2016-01-07 09:14:35 +01:00
Jenkins for ownCloud
27dfa74d89 [tx-robot] updated from transifex 2016-01-07 01:55:48 -05:00
Thomas Müller
002161857c Merge pull request #21398 from owncloud/sharing-disabled-cache 
Cache isSharingDisabledForUser
 2016-01-06 17:23:14 +01:00
Thomas Müller
b6bc17d014 Merge pull request #21443 from owncloud/fix-container-lookup 
Lookup the App name instead of OCA
 2016-01-06 17:22:41 +01:00
Thomas Müller
a2c19d3d1a Merge pull request #21444 from owncloud/move-regenerate-below 
Move regeneration of session ID into session classes
 2016-01-06 17:21:43 +01:00
Roeland Jago Douma
1358e5dcd9 [Sharing 2.0] Some error cases report 404 instead of 403 2016-01-06 15:25:29 +01:00
Roeland Jago Douma
26280e1f19 [Sharing 2.0] Add L10N instance to manager for translated errors 2016-01-06 14:53:43 +01:00
Roeland Jago Douma
b15be8f96f [Share 2.0] Make the share manager ready for share creation 2016-01-06 14:53:43 +01:00
Roeland Jago Douma
a08c497808 [Share 2.0] Make share provider ready for create shares 2016-01-06 14:53:43 +01:00
Roeland Jago Douma
4f2e84a0ec [Share 2.0] Update share class 
More getters and setters are required to properly create shares
 2016-01-06 14:53:43 +01:00
Morris Jobke
7b8b2c73c5 Drop oc_gallery_sharing which was removed in 8.0.0 
See c080dfe87d
 2016-01-06 13:45:59 +01:00
Lukas Reschke
88c7face07 Inject OCSClient 
Fixes https://github.com/owncloud/core/issues/21451
 2016-01-06 11:40:22 +01:00
Jörn Friedrich Dreyer
a86e067154 Merge pull request #21442 from owncloud/annotate-type 
Annotate type
 2016-01-05 12:36:31 +01:00
Jenkins for ownCloud
d4034ffca0 [tx-robot] updated from transifex 2016-01-05 01:57:14 -05:00
Lukas Reschke
fec41e7539 Move regeneration of session ID into session classes 
There were code paths that nowadays call ISession::login directly thus bypassing the desired regeneration of the session ID. This moves the session regeneration deeper into the session handling and thus ensures that it is always called. Furthermore, I also added the session regeneration to the remember me cookie plus added some test case expectations for this.
 2016-01-04 15:09:01 +01:00
Thomas Müller
70ff90b1ec Merge pull request #21393 from owncloud/fix-urlgenerator-call 
No more deprecation messages in error log
 2016-01-04 15:00:06 +01:00
Joas Schilling
2cf4e144cc Lookup the App name instead of OCA 2016-01-04 14:47:49 +01:00
Lukas Reschke
26c3fa7911 Annotate type 
Otherwise static code scanners will complain about this.
 2016-01-04 14:18:01 +01:00
Jenkins for ownCloud
157bb50a39 [tx-robot] updated from transifex 2016-01-04 01:55:05 -05:00
Jenkins for ownCloud
970495a067 [tx-robot] updated from transifex 2015-12-31 01:55:16 -05:00
Thomas Müller
42897ac5cb Merge pull request #21402 from owncloud/view-getuserobject-cache 
Cache usermanager instance in view
 2015-12-30 20:04:51 +01:00
Robin Appelman
45d0396404 Cache sharing disabled in the view 2015-12-30 14:42:22 +01:00
Robin Appelman
2d9d0aedf8 Cache usermanager instance in view 2015-12-30 14:28:53 +01:00
Thomas Müller
9e39e8f1c7 No more deprecation messages in error log 2015-12-29 17:31:28 +01:00
Thomas Müller
9392a555ae Merge pull request #21331 from switch-ch/fix_ms_log 
Fix owncloud logging with ms precision
 2015-12-29 16:32:52 +01:00
Thomas Müller
edd051dc02 Merge pull request #21291 from owncloud/refactor-call-check 
Refactor OC_Util::callCheck
 2015-12-28 10:21:44 +01:00
Thomas Müller
eb509bcbe6 Merge pull request #17333 from owncloud/php7-scalar-types-controllers 
Prefer scalar type hints over phpdoc annotation
 2015-12-28 10:21:14 +01:00
Jenkins for ownCloud
89584716f8 [tx-robot] updated from transifex 2015-12-28 01:55:10 -05:00
Bernhard Posselt
23c754aed3 prefer scalar type hints over phpdoc annotation 
use method exists lookup to be safe and not break on old hhvm versions

add test that checks if type hint is preferred over annotation
 2015-12-24 09:20:26 +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
Morris Jobke
6f00729124 Refactor OC_Util::callCheck 2015-12-22 09:32:14 +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
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
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
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
36cc0528e3 Merge pull request #21288 from owncloud/deprecated_helper_mimetypes 
Remove deprecated OC_Helper mimetype functions
 2015-12-18 15:23:05 +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