Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #20060 from owncloud/cache-move-final-update-transaction | Robin Appelman | 2015-10-29 | 1 | -2/+6 |
|\ | | | | | include the final update in the transaction when moving a folder in the cache | ||||
| * | include the final update in the transaction when moving a folder in the cache | Robin Appelman | 2015-10-29 | 1 | -2/+6 |
| | | |||||
* | | Merge pull request #19592 from owncloud/availability-root-always-exists | Thomas Müller | 2015-10-29 | 1 | -0/+3 |
|\ \ | |/ |/| | The root of a storage always exists | ||||
| * | The root of a storage always exists | Robin Appelman | 2015-10-29 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename | Thomas Müller | 2015-10-29 | 2 | -1/+23 |
|\ \ | | | | | | | On rename, also refresh storage_mtime of the target file | ||||
| * | | Also adjust storage_mtime of target after rename | Vincent Petry | 2015-10-26 | 2 | -1/+23 |
| | | | | | | | | | | | | Some storages like Dropbox change their mtime on rename... | ||||
* | | | Merge pull request #11509 from owncloud/internal_email_template | Thomas Müller | 2015-10-29 | 1 | -5/+5 |
|\ \ \ | | | | | | | | | Allow separate templates for internal and external share notifications | ||||
| * | | | Allow separate templates for internal and external share notifications | Stephen Colebrook | 2015-10-29 | 1 | -5/+5 |
| | |/ | |/| | |||||
* / | | Add a repair step that checks for group membership on shares | Joas Schilling | 2015-10-29 | 1 | -0/+13 |
|/ / | |||||
* | | Merge pull request #19182 from cweiske/support-bzip2 | Thomas Müller | 2015-10-28 | 2 | -2/+2 |
|\ \ | | | | | | | Fix #19181: Support .bz2 app archives | ||||
| * | | Fix #19181: Support .bz2 app archives | Christian Weiske | 2015-10-20 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | At first a bz2 handling in needs to be fixed; PEAR's Archive_Tar otherwise gives the following error: > Unsupported compression type "bz" > Supported types are "gz", "bz2" and "lzma2" After that we can whitelist the application/bz2 MIME type in the installer. | ||||
* | | | Make \OC\SubAdmin php-5.4 compatible | Roeland Jago Douma | 2015-10-28 | 1 | -4/+19 |
| | | | | | | | | | | | | * Also close some cursors while we are at it | ||||
* | | | Merge pull request #19837 from owncloud/always-enabled-apps | Thomas Müller | 2015-10-26 | 2 | -37/+51 |
|\ \ \ | | | | | | | | | Store list of apps which cannot be disabled in shipped.json | ||||
| * | | | Fail hard if shipped.json is missing | Thomas Müller | 2015-10-26 | 1 | -9/+5 |
| | | | | |||||
| * | | | Don't show apps which are always enabled in the app manager | Thomas Müller | 2015-10-26 | 2 | -9/+14 |
| | | | | |||||
| * | | | Store list of apps which cannot be disabled in shipped.json | Thomas Müller | 2015-10-26 | 2 | -33/+46 |
| | | | | |||||
* | | | | Update license headers | Lukas Reschke | 2015-10-26 | 31 | -28/+31 |
| |_|/ |/| | | |||||
* | | | Merge pull request #19982 from owncloud/fix-link-sharing-regression-master | Thomas Müller | 2015-10-26 | 1 | -8/+20 |
|\ \ \ | |/ / |/| | | Ensure the password is only hashed in case it's changed on the client… | ||||
| * | | Fix for broken ajax/share.php endpoint | Roeland Jago Douma | 2015-10-23 | 1 | -8/+16 |
| | | | | | | | | | | | | | | | Even more code mess :( All tests pass again. But I'm really not happy with this endpoint. | ||||
| * | | Ensure the password is only hashed in case it's changed on the client - ↵ | Thomas Müller | 2015-10-22 | 1 | -7/+11 |
| | | | | | | | | | | | | fixes #19950 | ||||
* | | | Throw exception on `getPath` if file does not exist | Lukas Reschke | 2015-10-25 | 3 | -7/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened. This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs. While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page. I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail. | ||||
* | | | Dont lock /$user/files | Robin Appelman | 2015-10-23 | 1 | -1/+1 |
| | | | |||||
* | | | Expose syslog tag in the configuration | Volker Fröhlich | 2015-10-22 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #19890 from owncloud/db-keep-shared-locks | Thomas Müller | 2015-10-22 | 2 | -18/+107 |
|\ \ | | | | | | | Keep shared locks until the end of the request so we can reuse them | ||||
| * | | add phpdoc | Robin Appelman | 2015-10-21 | 2 | -0/+13 |
| | | | |||||
| * | | Keep shared locks until the end of the request so we can reuse them | Robin Appelman | 2015-10-21 | 2 | -18/+94 |
| |/ | |||||
* | | Remove dependency on ICrypto + use XOR | Lukas Reschke | 2015-10-21 | 3 | -21/+15 |
| | | |||||
* | | Merge pull request #19918 from owncloud/send-begin-message | Thomas Müller | 2015-10-21 | 1 | -0/+6 |
|\ \ | | | | | | | Update: state which step we are going to start and warn if it might b… | ||||
| * | | Update: state which step we are going to start and warn if it might be slow | Joas Schilling | 2015-10-21 | 1 | -0/+6 |
| |/ | |||||
* | | Merge pull request #19927 from owncloud/install-shipped-apps-on-upgrade | Thomas Müller | 2015-10-21 | 1 | -0/+3 |
|\ \ | | | | | | | Install new shipped apps on upgrade | ||||
| * | | Install new shipped apps on upgrade -fixes #19925 | Thomas Müller | 2015-10-21 | 1 | -0/+3 |
| | | | |||||
* | | | Legacy OC_SubAdmin is now just a wrapper | Roeland Jago Douma | 2015-10-21 | 1 | -79/+57 |
| | | | |||||
* | | | New \OC\SubAdmin class | Roeland Jago Douma | 2015-10-21 | 3 | -95/+369 |
|/ / | | | | | | | | | | | | | * DI * Tests * moved OC_SubAdmin to legacy * Added to private OC\GroupManager | ||||
* | | Merge pull request #19883 from owncloud/provide-iappcontainer | Thomas Müller | 2015-10-21 | 1 | -0/+4 |
|\ \ | | | | | | | Provide IAppContainer as dependency injection | ||||
| * | | Provide IAppContainer as dependency injection | Morris Jobke | 2015-10-20 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #18184 from owncloud/ocs-merge-headers | Thomas Müller | 2015-10-21 | 2 | -8/+14 |
|\ \ \ | |_|/ |/| | | Merge headers of ocs results | ||||
| * | | fix PHPDoc | Thomas Müller | 2015-09-21 | 1 | -0/+1 |
| | | | |||||
| * | | Merge headers of ocs results | Thomas Müller | 2015-09-21 | 2 | -8/+13 |
| | | | |||||
* | | | Merge pull request #19884 from owncloud/locking_exception | Thomas Müller | 2015-10-20 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | catch all exception if table doesn't exists | ||||
| * | | | catch all exception if table doesn't exists | Björn Schießle | 2015-10-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #19874 from ↵ | Thomas Müller | 2015-10-20 | 1 | -1/+5 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | owncloud/delete-cookie-instead-of-setting-value-to-empty Delete cookie instead of emptying value | ||||
| * | | | Delete cookie instead of emptying value | Lukas Reschke | 2015-10-19 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHP will handle session cookies with an empty values as an E_WARNING error. ([php/#68063](https://bugs.php.net/bug.php?id=68063)) ownCloud sets the cookie to an empty value in case the session expires, it however after this starts a new session. Due to potential race conditions this can in unlikely cases lead to the fact that the session never gets restarted and the user is left with an empty cookie. PHP tries then to use the empty cookie which makes the instance not usable. To work around any race condition we now tell PHP to explicitly delete the value which can be done by using `null` as value, PHP will then send a cookie with the value "deleted". Also theepiration has been set to -1. | ||||
* | | | | Merge pull request #19666 from owncloud/fix_13002 | Thomas Müller | 2015-10-20 | 1 | -46/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Combine OCS API getUser method code into provisioning_api app | ||||
| * | | | Combine OCS API getUser method code into provisioning_api app | Roeland Jago Douma | 2015-10-13 | 1 | -46/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes #13002 Move the cloud/users/{userid} code in total to the provisioning API. | ||||
* | | | | [OCI setup] remove static logger/config calls | Morris Jobke | 2015-10-20 | 1 | -15/+17 |
| | | | | | | | | | | | | | | | | * logger/config object are already injected - this only uses it | ||||
* | | | | Merge pull request #17641 from owncloud/fix_objectstore_rename | Jörn Friedrich Dreyer | 2015-10-19 | 3 | -10/+14 |
|\ \ \ \ | | | | | | | | | | | don't move files in cache twice, fixes renaming for objectstores | ||||
| * | | | | fix objectstore files having create permissions | Robin Appelman | 2015-10-16 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | detect object homestorage in share code | Robin Appelman | 2015-10-16 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | don't move files in cache twice, fixes renaming for objectstores | Jörn Friedrich Dreyer | 2015-10-16 | 1 | -7/+9 |
| | | | | | |||||
* | | | | | Merge pull request #19833 from owncloud/fix_view_rmdir | Robin Appelman | 2015-10-19 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Removemount expects absolutePath |