summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 9.0.1v9.0.1C Montero-Luque2016-04-061-2/+2
|
* Merge pull request #23572 from owncloud/stabe9-release-notesThomas Müller2016-04-066-3/+261
|\ | | | | [Stable9] release notes
| * Remove duplicated messageJoas Schilling2016-04-062-46/+19
| |
| * Make the version a stringJoas Schilling2016-04-061-1/+1
| |
| * Show hint in CLIVictor Dubiniuk2016-04-067-158/+179
| |
| * Show release notesVictor Dubiniuk2016-04-053-0/+21
| |
| * Show cli notice for big installationsVictor Dubiniuk2016-04-052-29/+53
| |
| * Add releasenotes classVictor Dubiniuk2016-04-052-0/+219
| |
* | Merge pull request #23574 from owncloud/sabre-plugin-browser-error-page-stable9Thomas Müller2016-04-068-3/+229
|\ \ | | | | | | [stable9] Sabre plugin browser error page
| * | Add magical regex to catch browsersLukas Reschke2016-03-242-1/+15
| | |
| * | In case of exception we return an html page in case the client is a browserThomas Müller2016-03-247-3/+215
| | |
* | | Merge pull request #23799 from owncloud/dont-collide-with-php-internalsC. Montero Luque2016-04-061-3/+2
|\ \ \ | | | | | | | | [stable9] Use static method
| * \ \ Merge branch 'stable9' into dont-collide-with-php-internalsC. Montero Luque2016-04-061-1/+1
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #23805 from owncloud/backport-of-#23760Thomas Müller2016-04-061-1/+1
|\ \ \ \ | |_|_|/ |/| | | [stable9] Fix conditional check in MySQL setup
| * | | [stable9] Fix conditional check in MySQL setupDaniel Hansson2016-04-051-1/+1
|/ / / | | | | | | | | | | | | Backport of #23760 Fix conditional check in MySQL setup.
| * / Use static methodLukas Reschke2016-04-051-3/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 :see_no_evil:
* | Merge pull request #23764 from owncloud/backport-23743-transfer-ownershipThomas Müller2016-04-042-3/+13
|\ \ | | | | | | [9.0] Unmount the share before deleting it, so we don't try to use it later on
| * | Inject the Mount ManagerJoas Schilling2016-04-042-6/+10
| | |
| * | Unmount the share before deleting it, so we don't try to use it later onJoas Schilling2016-04-041-0/+6
| | |
* | | Merge pull request #23541 from owncloud/backport-23515-menu-languageThomas Müller2016-04-041-6/+4
|\ \ \ | | | | | | | | [9.0] Fix the translations of the User menu
| * | | Fix the translations of the User menuJoas Schilling2016-03-241-6/+4
| | | |
* | | | [stable9] Read available l10n files also from theme folderMorris Jobke2016-04-046-19/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | Merge pull request #23723 from ↵Thomas Müller2016-04-041-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/stable9-also-hide-password-for-private-key-password-update [stable9] Also replace password in updatePrivateKeyPassword
| * | | | Also replace password in updatePrivateKeyPasswordLukas Reschke2016-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23717
* | | | | Merge pull request #23735 from ↵Thomas Müller2016-04-042-7/+77
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | owncloud/stable9-core-globalajaxerrorwhengoingaway [stable9] Detect user navigating away, don't interpret as ajax error
| * | | | Adjust core unit tests for unload/reload casesVincent Petry2016-04-012-6/+43
| | | | |
| * | | | Stronger fix for navigate away detectionVincent Petry2016-04-011-2/+10
| | | | |
| * | | | Firefox returns 303 on cross-domain redirectVincent Petry2016-04-011-1/+1
| | | | | | | | | | | | | | | | | | | | Added 303 to catch SSO cross-domain redirect in Firefox.
| * | | | Detect user navigating away, don't interpret as ajax errorVincent Petry2016-04-011-1/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* / / / 9.0.1 RC2v9.0.1RC2C Montero-Luque2016-04-011-2/+2
|/ / /
* | | Merge pull request #23590 from owncloud/fix-themes-for-stable9Thomas Müller2016-04-011-1/+1
|\ \ \ | | | | | | | | [stable9] Fix for themes with .jpg backgrounds
| * | | [stable9] Fix for themes with .jpg backgroundsDaniel Hansson2016-03-261-1/+1
| | | | | | | | | | | | Without this all themes with .jpg or .jpeg are broken.
* | | | Merge pull request #23684 from owncloud/stable9-backport-23676Thomas Müller2016-04-013-1/+19
|\ \ \ \ | | | | | | | | | | [stable9] Properly handle return values of OC_App::getAppInfo()
| * | | | Properly handle return values of OC_App::getAppInfo()Morris Jobke2016-04-013-1/+19
|/ / / / | | | | | | | | | | | | * fixes #23668
* | | | Merge pull request #23709 from ↵Thomas Müller2016-04-012-7/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/stable9-make-sure-that-encrypted-version-is-set [stable9] Make sure that the encrypted version is set
| * | | | Make sure that the encrypted version is setLukas Reschke2016-03-312-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #23710 from ↵Thomas Müller2016-04-0112-130/+311
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix_encryption_versions_on_external_storages_9.0 [stable9] fix creation of versions of encrypted files on external storages
| * | | | | fix creation of versions of encrypted files on external storagesBjoern Schiessle2016-03-3112-130/+311
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge pull request #23518 from owncloud/stable9-gdrive-stream-downloadThomas Müller2016-03-311-4/+5
|\ \ \ \ \ | | | | | | | | | | | | [stable9] GDrive stream download with RetryWrapper
| * | | | | GDrive stream download with RetryWrapperVincent Petry2016-03-301-4/+5
| | | | | |
* | | | | | Merge pull request #23522 from owncloud/stable9-dropbox-stream-downloadFrank Karlitschek2016-03-312-8/+32
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [stable9] Dropbox stream download with RetryWrapper
| * | | | | Dropbox stream download with RetryWrapperVincent Petry2016-03-231-4/+6
| | | | | |
| * | | | | Fix dropbox storage to not store the whole file in memoryVincent Petry2016-03-232-7/+29
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Since the library can only store the full response in memory on download, we use an alternate client lib and set the correct headers to be able to stream the content to a temp file.
* | | | | Merge pull request #23689 from owncloud/revert-23629Thomas Müller2016-03-3114-137/+65
|\ \ \ \ \ | | | | | | | | | | | | Revert "Explicitly add the current principal to the acl in case of gr…
| * | | | | Revert "Explicitly add the current principal to the acl in case of group ↵Thomas Müller2016-03-3114-137/+65
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | sharing" This reverts commit 52f4acf23d9e388fdc6348858c4572e291bbc56b.
* | | | | Merge pull request #23673 from owncloud/stable9-fix-sftp-retry-wrapperThomas Müller2016-03-311-1/+3
|\ \ \ \ \ | | | | | | | | | | | | [stable9] Use RetryWrapper for SFTP storage
| * | | | | Use RetryWrapper for SFTP storageLukas Reschke2016-03-301-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Equivalent to https://github.com/owncloud/core/pull/23442 Required for making encryption work with external storage reliable.
* | | | | | Merge pull request #23552 from ↵Thomas Müller2016-03-3110-88/+214
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix-group-sharing-for-v1-caldav-and-carddav-stable9 Fix group sharing for v1 caldav and carddav stable9
| * | | | | | Handle group shares of addressbooks on v1 as well ... now FINALLY ....Thomas Müller2016-03-311-1/+2
| | | | | | |
| * | | | | | Fix acls for calendar objects and cards - fixes #23273Thomas Müller2016-03-319-84/+193
| | | | | | |