Commit Graph

23104 Commits

Author SHA1 Message Date
Thomas Müller
14c592fe86 Merge pull request #14500 from owncloud/fileglobalgc-cleanup
Cleanup garbage collection for global file cache
2015-02-25 06:41:57 -08:00
Robin McCorkell
695f43a1ed Merge pull request #10735 from owncloud/use_remote_addr
Use getRemoteAddress which supports reverse proxies
2015-02-25 13:24:39 +00:00
Robin Appelman
a848a6b1dd Cleanup garbage collection for global file cache 2015-02-25 14:13:58 +01:00
Thomas Müller
f5b6226732 Merge pull request #14462 from owncloud/add-some-php-docs
Add some PHPDocs
2015-02-25 02:53:22 -08:00
Thomas Müller
f6044fe429 Merge pull request #14460 from owncloud/revive/12971
Add support for sftp custom port
2015-02-25 02:52:25 -08:00
Thomas Müller
bcf3704645 Merge pull request #14458 from owncloud/revive/11157
Get the real protocol behind several proxies
2015-02-25 02:51:46 -08:00
Robin McCorkell
af96078153 Merge pull request #14475 from owncloud/fix-ext-owncloud
Fix bugs in ownCloud external storage
2015-02-25 10:39:25 +00:00
Thomas Müller
7f7cdecb1a Merge pull request #13741 from owncloud/autotest_improvements
Better config cleanup in autotest.sh
2015-02-25 02:31:14 -08:00
Thomas Müller
799e144b04 Merge pull request #14151 from owncloud/update-sabre2.1
Sabre Update to 2.1
2015-02-25 02:21:55 -08:00
Robin McCorkell
edfeb05a05 Fix bugs in ownCloud external storage 2015-02-25 10:10:13 +00:00
Thomas Müller
b3de86d851 Remove locks plugin.
Reasoning:
- a WebDAV server is not required to implement locking support
- WebDAV Locking is know to break the sync algorithm
- the current lock implementation is known to be broken (locks are not moved if a file is moved, locks on shared files don't work)
2015-02-25 10:30:47 +01:00
Vincent Petry
fb87b746f0 Merge pull request #14213 from AW-UC/naturalsort_defaultcollator-patch-file-sorting
Update naturalsort_defaultcollator.php. Fixes #13982
2015-02-25 10:30:14 +01:00
Thomas Müller
7e7e0c51fb Merge pull request #14471 from owncloud/always-load-authentication-apps
Always load authentication apps
2015-02-24 23:31:40 -08:00
Jenkins for ownCloud
31f881415b [tx-robot] updated from transifex 2015-02-25 01:55:51 -05:00
AW-UC
0066c6f001 Add PHPunit test for DefaultCollator
This extends Test_NaturalSort to include a basic test for
\OC\NaturalSort_DefaultCollator()
2015-02-24 23:51:08 +01:00
AW-UC
d57f5c70e9 Fix sorting for files that only differ in case. 2015-02-24 23:50:38 +01:00
Lukas Reschke
c1d7b22d08 Always load authentication apps
The current code path may trigger situations where the LDAP application is not yet loaded and thus problems with the authentication appeared.

In previous versions of ownCloud the authentication mechanism manually loaded these apps which is why this affects ownCloud 8 and master only for my knowledge. (certainly not 6, maybe 7)

Backport to 8 might be something to consider.

Fixes https://github.com/owncloud/core/issues/14469
2015-02-24 18:00:26 +01:00
Thomas Müller
09a06e4f0a Merge pull request #14068 from owncloud/autotest-external-sftp
[files_external] sftp tests
2015-02-24 08:06:27 -08:00
Lukas Reschke
52495dc995 Merge pull request #13740 from owncloud/fix-12190-2
Include primary groups in user and login filter when restricting group access and also fix user counting in primary groups
2015-02-24 16:37:49 +01:00
Lukas Reschke
b6289542e8 Merge pull request #14400 from owncloud/fix-cron-deadlock
Use flock instead of just checking if there is a file to prevent deadloc...
2015-02-24 16:16:48 +01:00
Bernhard Posselt
5b506ab518 use flock instead of just checking if there is a file to prevent deadlocks when the process crashed or the unlink wasnt done
move cron.lock into top directory to prevent external storage issues

use tmp directory lock file

use new config interface

incorporate #13770

add dots
2015-02-24 15:41:20 +01:00
Lukas Reschke
d43d34c93f Merge pull request #14195 from owncloud/activity-manager-performance-improvements
Activity manager performance improvements
2015-02-24 15:19:15 +01:00
Thomas Müller
7325414481 Merge pull request #14282 from owncloud/disable-non-shipped-apps-master
3rd-party apps are disabled on upgrade
2015-02-24 14:39:45 +01:00
Thomas Müller
48cefd9bd5 Merge pull request #14461 from owncloud/fix-code-that-never-worked
Fix code that never worked
2015-02-24 14:00:43 +01:00
Joas Schilling
88cfe46906 Merge pull request #11555 from goodkiller/patch-1
Update group.php
2015-02-24 13:58:41 +01:00
Lukas Reschke
276824299c Merge pull request #13340 from owncloud/use-http-only
Use "HTTPOnly" for cookies when logging out
2015-02-24 13:50:49 +01:00
Lukas Reschke
dbb665a361 Add some PHPDocs
My IDE was crying...
2015-02-24 13:44:40 +01:00
Lukas Reschke
9adcd15cb3 Use [0] instead of current as HHVM might have problems with that 2015-02-24 13:37:34 +01:00
Lukas Reschke
65dcbccee0 Merge pull request #14459 from owncloud/fix-oracle
Dont break code which relies on the cursor being open after insert/updat...
2015-02-24 13:35:07 +01:00
Lukas Reschke
1229184873 Fix code that never worked
Introduced with 1df8a5a774 in February 2013…
2015-02-24 13:26:23 +01:00
Lukas Reschke
6dd5bc0379 Fix code style as per review 2015-02-24 13:22:12 +01:00
SA
350f8eb86e Add support for sftp custom port 2015-02-24 13:15:38 +01:00
Bernhard Posselt
fd3663f563 Dont break code which relies on the cursor being open after insert/update/delete 2015-02-24 12:58:36 +01:00
Thomas Müller
58cedc07b5 print app upgrade information to console as well 2015-02-24 12:52:16 +01:00
Thomas Müller
80cafe29a8 3rd-party apps are only disabled in case core is upgraded 2015-02-24 12:51:55 +01:00
Lukas Reschke
1c6eae9017 Get the real protocol behind several proxies
X-Forwarded-Proto contains a list of protocols if ownCloud is behind multiple reverse proxies.

This is a revival of https://github.com/owncloud/core/pull/11157 using the new IRequest public API.
2015-02-24 12:24:55 +01:00
Lukas Reschke
e08ebe87dc Merge pull request #10830 from Finkregh/patch-1
add question about user-backend
2015-02-24 12:13:55 +01:00
Thomas Müller
fe7e7677e9 shipped and 3rd-party apps of type authentication and session will remain enabled during update 2015-02-24 12:02:37 +01:00
Thomas Müller
bbf7f56f94 3rd-party apps are disabled on upgrade - refs #14026 2015-02-24 12:02:36 +01:00
Lukas Reschke
e5c6af5102 Merge pull request #10599 from owncloud/move_passwordchange_text
Make the password changed msg inline to fix #10242
2015-02-24 11:54:17 +01:00
Lukas Reschke
165afb004b Use getRemoteAddress which supports reverse proxies
Breaking change for 8.1 wiki (Security > Administrators):

The log format for failed logins has changed and uses now the remote address and is considering reverse proxies for such scenarios when configured correctly.
2015-02-24 11:49:40 +01:00
Thomas Müller
da8e34cf7f Merge pull request #14009 from owncloud/installing-installed-apps-is-stupid
don't allow installation of already installed apps - fixes #14004
2015-02-24 10:34:06 +01:00
Joas Schilling
a320edaca5 Merge pull request #14419 from owncloud/preview_apostrophe_fix
fix issue with previews not being displayed if filename contains apostrophe
2015-02-24 09:58:53 +01:00
Lukas Reschke
8bd3d55517 Merge pull request #14442 from owncloud/fix-oracle-ci-master
Close the cursor after the affected count has been extracted.
2015-02-24 09:20:59 +01:00
Jenkins for ownCloud
cdb4cfd939 [tx-robot] updated from transifex 2015-02-24 01:54:58 -05:00
Thomas Müller
b40d4c9cbc app store can be used with any edition 2015-02-23 23:16:28 +01:00
Thomas Müller
39d8406933 don't allow installation of already installed apps - fixes #14004 2015-02-23 23:16:28 +01:00
Thomas Müller
0cdc2cebbf Merge pull request #14433 from owncloud/fix-public-php
Use `getParam` instead of `server`
2015-02-23 22:43:51 +01:00
Thomas Müller
e87ada86d1 Merge pull request #14416 from owncloud/setup-command
Setup command
2015-02-23 22:41:10 +01:00
Lukas Reschke
432d7be8cc Show a empty response for GET on non-files instead of the Browser Plugin 2015-02-23 22:27:23 +01:00