Commit Graph

31258 Commits

Author SHA1 Message Date
Thomas Müller c929c4db84 Merge pull request #23801 from owncloud/fix-23496-master-stable9
[stable9] Avoid fatal php error dring cron execution
2016-04-08 14:50:32 +02:00
Thomas Müller 0a79241a0a Merge pull request #23837 from owncloud/stable9-handle-null-in-usermanager
[stable9] Prevent null to be passed into the closure of callForAllUsers
2016-04-08 14:50:15 +02:00
Thomas Müller 8b87837a4d Prevent null to be passed into the closure of callForAllUsers 2016-04-07 14:11:48 +02:00
Erik Pellikka 35d044c121 sidebar click modification 2016-04-07 05:07:15 -04:00
C Montero-Luque 54fc92c372 9.0.1 2016-04-06 17:30:21 -04:00
Thomas Müller 76342fa27d Merge pull request #23572 from owncloud/stabe9-release-notes
[Stable9] release notes
2016-04-06 20:53:59 +02:00
Joas Schilling c43713515b
Remove duplicated message 2016-04-06 15:51:25 +02:00
Joas Schilling e5bec54e4e
Make the version a string 2016-04-06 15:41:25 +02:00
Victor Dubiniuk b87b27cbd9
Show hint in CLI 2016-04-06 15:34:16 +02:00
Thomas Müller dca6869a89 Merge pull request #23574 from owncloud/sabre-plugin-browser-error-page-stable9
[stable9] Sabre plugin browser error page
2016-04-06 15:32:12 +02:00
C. Montero Luque 1092de539f Merge pull request #23799 from owncloud/dont-collide-with-php-internals
[stable9] Use static method
2016-04-06 09:20:19 -04:00
C. Montero Luque 6e55f93836 Merge branch 'stable9' into dont-collide-with-php-internals 2016-04-06 09:20:11 -04:00
Thomas Müller fa7f1874dd Merge pull request #23805 from owncloud/backport-of-#23760
[stable9] Fix conditional check in MySQL setup
2016-04-06 14:28:57 +02:00
Victor Dubiniuk cfd8cc3fd8 Show release notes 2016-04-05 17:13:31 +03:00
Victor Dubiniuk 118c39d472 Show cli notice for big installations 2016-04-05 17:13:31 +03:00
Victor Dubiniuk b05269826a Add releasenotes class 2016-04-05 17:13:31 +03:00
Daniel Hansson cff3122a37 [stable9] Fix conditional check in MySQL setup
Backport of #23760

Fix conditional check in MySQL setup.
2016-04-05 15:16:02 +02:00
Thomas Müller 19541dd1ce fixes #23496 2016-04-05 14:01:23 +02:00
Lukas Reschke a50619200c Use static method
This is ugly as hell. But if we directly access `\OCP\IUserSession::getUser` here PHP throws a segfault on some servers:

```
gdb /usr/sbin/apache2 --batch --quiet -ex "run -f /etc/apache2/apache2.conf -DNO_DETACH -DONE_PROCESS -DDEBUG $defines" -ex "quit"
[Thread debugging using libthread_db enabled]
Using host libthread_db library "/lib/x86_64-linux-gnu/libthread_db.so.1".
AH00558: apache2: Could not reliably determine the server's fully qualified domain name, using 172.17.0.6. Set the 'ServerName' directive globally to suppress this message
warning: the debug information found in "/usr/lib/debug//usr/lib/php5/20121212/mysql.so" does not match "/usr/lib/php5/20121212/mysql.so" (CRC mismatch).

warning: the debug information found in "/usr/lib/debug/usr/lib/php5/20121212/mysql.so" does not match "/usr/lib/php5/20121212/mysql.so" (CRC mismatch).

warning: the debug information found in "/usr/lib/debug//usr/lib/php5/20121212/mysqli.so" does not match "/usr/lib/php5/20121212/mysqli.so" (CRC mismatch).

warning: the debug information found in "/usr/lib/debug/usr/lib/php5/20121212/mysqli.so" does not match "/usr/lib/php5/20121212/mysqli.so" (CRC mismatch).

warning: the debug information found in "/usr/lib/debug//usr/lib/php5/20121212/pdo_mysql.so" does not match "/usr/lib/php5/20121212/pdo_mysql.so" (CRC mismatch).

warning: the debug information found in "/usr/lib/debug/usr/lib/php5/20121212/pdo_mysql.so" does not match "/usr/lib/php5/20121212/pdo_mysql.so" (CRC mismatch).

[New Thread 0x7fffdd206700 (LWP 28386)]
[Thread 0x7fffdd206700 (LWP 28386) exited]
[New Thread 0x7fffdd206700 (LWP 28387)]
[New Thread 0x7fffdc975700 (LWP 28388)]

Program received signal SIGSEGV, Segmentation fault.
zend_parse_parameters (num_args=2, type_spec=type_spec@entry=0x7ffff3f85227 "s|s") at /build/php5-pO28mL/php5-5.5.9+dfsg/Zend/zend_API.c:923
923 /build/php5-pO28mL/php5-5.5.9+dfsg/Zend/zend_API.c: No such file or directory.
A debugging session is active.

    Inferior 1 [process 28382] will be killed.

Quit anyway? (y or n) [answered Y; input not from terminal]
```

I'm still struggling to get a minimal example of this (also considering that it doesn't happen on every system :party). Anyways, it's a functional workaround until I determined the root cause… (also given the fact that patches may never be backported to distributions 🙈
2016-04-05 12:45:46 +02:00
Morris Jobke 7fdac35654 Fix PHP memory leak in file_get_contents()
* ref https://bugs.php.net/bug.php?id=61961
* ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256
* code is based on the proposal of @chriseqipe
* fixes #20261
2016-04-04 18:14:39 +02:00
Thomas Müller 277c9f4a03 Merge pull request #23764 from owncloud/backport-23743-transfer-ownership
[9.0] Unmount the share before deleting it, so we don't try to use it later on
2016-04-04 16:48:29 +02:00
Thomas Müller 4da4163d14 Merge pull request #23541 from owncloud/backport-23515-menu-language
[9.0] Fix the translations of the User menu
2016-04-04 16:47:39 +02:00
Morris Jobke 85a0dd3689 [stable9] Read available l10n files also from theme folder
* Read available l10n files also from theme folder

The old behaviour was that only languages could be used for an app
that are already present in the apps/$app/l10n folder. If there is
a themed l10n that is not present in the apps default l10n folder
the language could not be used and the texts are not translated.

With this change this is possible and also the l10n files are
loaded even if the default l10n doesn't contain the l10n file.

* Inject server root - allows proper testing and separation of concerns
2016-04-04 13:29:04 +02:00
Thomas Müller f8b1e2cca1 Merge pull request #23723 from owncloud/stable9-also-hide-password-for-private-key-password-update
[stable9] Also replace password in updatePrivateKeyPassword
2016-04-04 10:54:47 +02:00
Thomas Müller 501cb1a147 Merge pull request #23735 from owncloud/stable9-core-globalajaxerrorwhengoingaway
[stable9] Detect user navigating away, don't interpret as ajax error
2016-04-04 10:54:34 +02:00
Joas Schilling dd5f38e351 Inject the Mount Manager 2016-04-04 09:10:43 +02:00
Joas Schilling d857f7caf2 Unmount the share before deleting it, so we don't try to use it later on 2016-04-04 09:10:33 +02:00
C Montero-Luque 6774f60240 9.0.1 RC2 2016-04-01 23:00:23 +02:00
Vincent Petry c58e96e639 Adjust core unit tests for unload/reload cases 2016-04-01 16:55:55 +02:00
Vincent Petry 51ff3e7443 Stronger fix for navigate away detection 2016-04-01 16:55:47 +02:00
Vincent Petry d8261d41cc Firefox returns 303 on cross-domain redirect
Added 303 to catch SSO cross-domain redirect in Firefox.
2016-04-01 16:55:40 +02:00
Vincent Petry 752e6676e1 Detect user navigating away, don't interpret as ajax error
Whenever a user navigates away, all ajax calls will fail with the same
result like a cross-domain redirect (SSO). To distinguish these cases,
we need to detect whether the error is a result of the user navigating
away. For this, we introduce a new flag that will be set in
"beforeunload".

Additional handling was required for false positives in case "beforeunload" is
used (ex: cancelled upload) and the user cancelled the navigation.
2016-04-01 16:55:34 +02:00
Lukas Reschke 78ee14dad5 Also replace password in updatePrivateKeyPassword
Fixes https://github.com/owncloud/core/issues/23717
2016-04-01 11:06:31 +02:00
Thomas Müller 9c800f62dd Merge pull request #23590 from owncloud/fix-themes-for-stable9
[stable9] Fix for themes with .jpg backgrounds
2016-04-01 11:02:42 +02:00
Thomas Müller 059df32542 Merge pull request #23684 from owncloud/stable9-backport-23676
[stable9] Properly handle return values of OC_App::getAppInfo()
2016-04-01 11:02:09 +02:00
Morris Jobke 43579e784f Properly handle return values of OC_App::getAppInfo()
* fixes #23668
2016-04-01 09:16:47 +02:00
Thomas Müller 193a33a8ad Merge pull request #23709 from owncloud/stable9-make-sure-that-encrypted-version-is-set
[stable9] Make sure that the encrypted version is set
2016-04-01 09:08:50 +02:00
Thomas Müller b84746ce36 Merge pull request #23710 from owncloud/fix_encryption_versions_on_external_storages_9.0
[stable9] fix creation of versions of encrypted files on external storages
2016-04-01 09:08:09 +02:00
Bjoern Schiessle 2cb45e71ea fix creation of versions of encrypted files on external storages
in order to create a 1:1 copy of a file if a version gets created
we need to store this information on copyBetweenStorage(). This
allows us to by-pass the encryption wrapper if we read the source file.
2016-03-31 23:18:45 +02:00
Thomas Müller e3cc82df38 Merge pull request #23518 from owncloud/stable9-gdrive-stream-download
[stable9] GDrive stream download with RetryWrapper
2016-03-31 23:14:49 +02:00
Frank Karlitschek 05fd4f2da0 Merge pull request #23522 from owncloud/stable9-dropbox-stream-download
[stable9] Dropbox stream download with RetryWrapper
2016-03-31 21:18:29 +02:00
Lukas Reschke d16553d2d8 Make sure that the encrypted version is set
The code path called when using external storage with WebDAV is using `\OC\Files\Storage\Wrapper\Encryption::getMetaData` which did not contain the actual encrypted version inside the cache entry version. This lead to the following:

1. User uploaded a file
2. File is created and `\OC\Files\Storage\Wrapper\Encryption::getMetaData` is called. It has an empty `encryptedVersion` but sets `encrypted` to either `true` or `false`.
3. The call when updating the file cache will use the old version.
2016-03-31 20:39:35 +02:00
Thomas Müller 8453073fdb Merge pull request #23689 from owncloud/revert-23629
Revert "Explicitly add the current principal to the acl in case of gr…
2016-03-31 12:32:34 +02:00
Thomas Müller b6fb3148c2 Revert "Explicitly add the current principal to the acl in case of group sharing"
This reverts commit 52f4acf23d.
2016-03-31 11:22:47 +02:00
Thomas Müller cfe0a6450e Merge pull request #23673 from owncloud/stable9-fix-sftp-retry-wrapper
[stable9] Use RetryWrapper for SFTP storage
2016-03-31 11:12:29 +02:00
Thomas Müller 5f5e13351a Merge pull request #23552 from owncloud/fix-group-sharing-for-v1-caldav-and-carddav-stable9
Fix group sharing for v1 caldav and carddav stable9
2016-03-31 11:12:12 +02:00
Thomas Müller ef8b75960c Handle group shares of addressbooks on v1 as well ... now FINALLY .... 2016-03-31 09:07:36 +02:00
Thomas Müller f28817aed5 Fix acls for calendar objects and cards - fixes #23273 2016-03-31 09:07:36 +02:00
Thomas Müller cb300d164e Return proper current-user-principal on v1 endpoints - fixes #23306 2016-03-31 09:05:39 +02:00
Thomas Müller e664e582fb Fix group shares on v1 caldav and carddav - fixes #23328 2016-03-31 09:05:39 +02:00