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

11382 commits

Author SHA1 Message Date
Roeland Jago Douma
b26b8d17eb Remove support for old shares in the default share provider 
In 9.0 we converted the old shares to the new shares. So for 9.1 we can
savely remove the fallback code.

This code was required when there was no initiator set.

* Fixed unit tests
 2016-03-23 07:58:17 +01:00
Thomas Müller
640e6351f1 Merge pull request #23485 from owncloud/composer_allow_ocp 
Allow OCP classes to be PSR-4 as well
 2016-03-22 21:28:45 +01:00
Thomas Müller
d5be21fe81 Merge pull request #23398 from owncloud/block_group_sharing 
Allow blocking of group sharing
 2016-03-22 21:28:13 +01:00
Lukas Reschke
1fffc30cf0 Only use the user session if ownCloud is already installed 
When installing ownCloud with autotest and MySQL some log entries may be created which will invoke the logging class. IUserSession has a dependency on the database which will make the installation fail => 💣
 2016-03-22 17:34:20 +01:00
Thomas Müller
460bafea8a Merge pull request #23484 from owncloud/if-class-is-already-loaded-dont-load-it-again 
Dont double load class
 2016-03-22 17:25:02 +01:00
Roeland Jago Douma
52826d0e24 Block group sharing in API and in share manager 
* Fix tests
 2016-03-22 17:13:34 +01:00
Roeland Jago Douma
195efc12eb Add config to sharemanager 2016-03-22 17:13:34 +01:00
Thomas Müller
6aa28037c7 Merge pull request #23437 from owncloud/save-query-when-the-list-is-empty 
Save the query when we get tags for no objects
 2016-03-22 17:12:24 +01:00
Roeland Jago Douma
5b78c604b5 Move IServerContainter to PSR-4 2016-03-22 16:39:19 +01:00
Roeland Jago Douma
f838d24c5d Allos OCP classes to be PSR-4 as well 
This adds the OCP namespace to the composer autoloader as well.
This means that now we can use proper PSR-4 filenames in OCP.
 2016-03-22 16:31:18 +01:00
Lukas Reschke
8e72e51b21 Dont double load class 
If the class already exists we should not load it twice. Since the composer autoloader is also used in core this could otherwise load a file twice.

This leads to problems otherwise with case insensitive operating systems like OS X. We can get rid of this once all file names in OC follow PSR-4, until then we probably need this check.
 2016-03-22 16:19:12 +01:00
Thomas Müller
ffe57a55d9 Merge pull request #23461 from owncloud/activity-491-autoloading-issue-without-sharing 
Fix "AutoloadNotAllowedException" when files_sharing is disabled
 2016-03-22 15:12:25 +01:00
Thomas Müller
0cd93a8e72 Merge pull request #23411 from owncloud/new_sharing_to_composer 
Move sharing 2.0 to composer autoloader
 2016-03-22 15:10:11 +01:00
Joas Schilling
dcca20a48a Save the query when we get tags for no objects 2016-03-22 11:13:11 +01:00
Thomas Müller
7426be0937 Merge pull request #23448 from owncloud/issue-22993-soften-exception-on-enable-default-app 
Do not abort with an exception when a default app can not be enabled
 2016-03-22 10:19:59 +01:00
Thomas Müller
da8781e425 Merge pull request #23443 from owncloud/some-more-logging-information 
Log more information by default
 2016-03-22 10:06:32 +01:00
Joas Schilling
24ce4b0f7d Fix "AutoloadNotAllowedException" when files_sharing is disabled 2016-03-22 08:42:25 +01:00
Thomas Müller
61629ad9ad Merge pull request #23424 from owncloud/fix-cachewrapper-doc-issue 
Fix doc issue of cache wrapper
 2016-03-21 18:03:35 +01:00
Joas Schilling
444343dc2b Do not abort with an exception when a default app can not be enabled 2016-03-21 16:31:59 +01:00
Lukas Reschke
7adae4476f Log more information by default 
This modifies the logger to add the following logging information by default:

- Request Method
- Request URL
- Current user
 2016-03-21 15:48:01 +01:00
Vincent Petry
f28f538029 Do not fire pre/post hooks twice on chunk upload 2016-03-21 15:14:58 +01:00
Joas Schilling
e86fd945dd Fix doc issue of cache wrapper 2016-03-21 10:45:53 +01:00
Thomas Müller
16782484b9 Merge pull request #23349 from owncloud/hardenings 
Hardenings
 2016-03-21 09:45:05 +01:00
Thomas Müller
ef4dc22a6a Merge pull request #23369 from owncloud/use-raw-path 
Use raw PATH_INFO
 2016-03-21 09:44:27 +01:00
Thomas Müller
b9da594bd9 Merge pull request #23374 from owncloud/fix-htaccess-issues 
Write .htaccess update only if not already written
 2016-03-21 09:43:18 +01:00
Jenkins for ownCloud
35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Roeland Jago Douma
c6edbfecbe Move (new) sharing over to composer autoloader 2016-03-20 14:12:36 +01:00
Jenkins for ownCloud
1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Jenkins for ownCloud
9c053ed465 [tx-robot] updated from transifex 2016-03-19 01:55:39 -04:00
Jenkins for ownCloud
a6c921267e [tx-robot] updated from transifex 2016-03-18 01:59:00 -04:00
Lukas Reschke
e867a7d54d Write .htaccess update only if not already written 
The ownCloud update routine also runs the "updateHtaccess" code in case only an application gets updated. This leads to having entries multiple time in the .htaccess file leading to unpredictable behaviour.

With 9.0 we added the "#### DO NOT CHANGE ANYTHING ABOVE THIS LINE ####" entry to the .htaccess file, this change uses it to ensure that only to the .htaccess gets written if the file has not been modified already. Since the .htaccess modifications are optional this is not a big deal.

Without this change updates of applications can break the rewrite rules (ending in endless redirects) as well as breaking the code integrity checker.
 2016-03-17 17:59:28 +01:00
Lukas Reschke
24abe1e1e1 Use raw PATH_INFO 
PATH_INFO will be empty at this point and thus the logic in base.php did not catch this. Changing this to "getRawPathInfo" will ensure that the path info is properly read.

Fixes https://github.com/owncloud/core/issues/23199
 2016-03-17 17:32:38 +01:00
Lukas Reschke
bf017f5c11 Remove unused code 
This code is not used anymore.
 2016-03-17 13:09:23 +01:00
Lukas Reschke
979a3ff830 Escape App ID 
While all callers do this as well this prevents a misuse of the API by mistake.
 2016-03-17 13:09:22 +01:00
Manish Bisht
07e7d4836e Update oci.php 
Error Fixed

combined the database errors

Merged Database Errors
 2016-03-16 19:21:14 +01:00
Thomas Müller
2f5b929ee9 Merge pull request #23108 from owncloud/set-encrypted-version-at-least-to-1 
Ensure that stored version is at least 1 for cross-storage copy
 2016-03-16 13:14:36 +01:00
Thomas Müller
5f00724e5b Merge pull request #23189 from owncloud/require-at-least-libxml-2-7-0 
Require at least libxml 2.7.0
 2016-03-16 13:11:59 +01:00
Lukas Reschke
676041ba7e Ensure that stored version is at least 1 for cross-storage copy 
In case of a move operation from an unencrypted to an encrypted
storage the old encrypted version would stay with "0" while the
correct value would be "1". Thus we manually set the value to "1"
for those cases.

See also https://github.com/owncloud/core/issues/23078
 2016-03-16 10:36:15 +01:00
Jenkins for ownCloud
631ae2f0f4 [tx-robot] updated from transifex 2016-03-16 01:55:43 -04:00
Thomas Müller
f7140294f2 Merge pull request #23157 from owncloud/remove-share-prop-entries 
remove old share propagation entries from appconfig
 2016-03-15 16:04:17 +01:00
Thomas Müller
27760ae54e Merge pull request #23164 from owncloud/db-connection-precondition-fix 
Prevent certain DBs throwing exceptions on same-value updates
 2016-03-15 16:03:55 +01:00
Thomas Müller
7b06dd485d Merge pull request #23250 from owncloud/fix-support-for-php7-in-htaccess 
Fix several .htaccess and .user.ini related problems
 2016-03-15 16:03:18 +01:00
Robin McCorkell
1b2f1cc272 Prevent certain DBs throwing exceptions on same-value updates 
A PreconditionNotMetException must only be thrown if explicit
preconditions are specified for setValues(), not if the value is merely
the same as was already in the DB.
 2016-03-15 13:02:19 +01:00
Thomas Müller
ad9a0804f3 Merge pull request #23226 from owncloud/fix_23190 
Generate a valid URL for link notification
 2016-03-15 12:55:13 +01:00
Robin Appelman
0aa83511a1 remove old share propagation entries from appconfig 2016-03-15 12:50:22 +01:00
Thomas Müller
0f6ea9fd29 Merge pull request #23039 from owncloud/invalid-share-storage 
dont break when there is an invalid share
 2016-03-15 12:15:05 +01:00
Thomas Müller
e9eeb3607f Merge pull request #23074 from owncloud/issue-22835-correctly-use-querybuilder-api 
Correctly escape join statements and use selectAlias
 2016-03-15 12:14:17 +01:00
Roeland Jago Douma
1db82073a4 Generate a valid URL for link notification 
fixes #23197

* Updated unit test
 2016-03-15 11:10:24 +01:00
Lukas Reschke
5278bfe0e4 Add support for custom values in integrity checker 2016-03-15 10:41:17 +01:00
Lukas Reschke
c7abd307c0 Replace all required values 2016-03-15 10:41:17 +01:00