summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #23557 from owncloud/sabre-plugin-browser-error-pageThomas Müller2016-04-042-1/+12
|\ | | | | In case of exception we return an html page in case the client is a b…
| * Add magical regex to catch browsersLukas Reschke2016-03-241-0/+8
| |
| * In case of exception we return an html page in case the client is a browserThomas Müller2016-03-241-1/+4
| |
* | Add better messages for sometimes obscure exceptionsBernhard Posselt2016-04-041-2/+27
| | | | | | | | | | | | * add better messages for sometimes obscure exceptions * fix formatting
* | Merge pull request #23722 from ↵Thomas Müller2016-04-041-1/+1
|\ \ | | | | | | | | | | | | owncloud/also-hide-password-for-private-key-password-update 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 #23728 from owncloud/sanitize-more-data-for-config-reportJoas Schilling2016-04-041-1/+13
|\ \ \ | | | | | | | | Sanitize more data in config report
| * | | Sanitize more data in config reportLukas Reschke2016-04-011-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sanitizes the following keys as well: - `proxyuserpwd` - `shared_secret` of `log.condition` - `license-key` - `password` of `redis`
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-0212-0/+24
|/ / /
* / / Initialise the printcss arrayJoas Schilling2016-04-011-0/+1
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2016-04-012-0/+2
| |
* | Merge pull request #23713 from owncloud/small_encryption_fixThomas Müller2016-03-311-0/+1
|\ \ | | | | | | make sure that we always remove the file again from the cache after t…
| * | make sure that we always remove the file again from the cache after the ↵Bjoern Schiessle2016-03-311-0/+1
| | | | | | | | | | | | version was created
* | | Merge pull request #23676 from owncloud/handle-null-return-getAppInfoMorris Jobke2016-03-313-1/+19
|\ \ \ | | | | | | | | Properly handle return values of OC_App::getAppInfo()
| * | | Properly handle return values of OC_App::getAppInfo()Morris Jobke2016-03-303-1/+19
| | | | | | | | | | | | | | | | * fixes #23668
* | | | Merge pull request #16857 from owncloud/printStylesheetsC. Montero Luque2016-03-311-9/+39
|\ \ \ \ | |_|/ / |/| | | Support for print stylesheets
| * | | support print stylesheetsHendrik Leppelsack2016-01-131-9/+39
| | | |
* | | | Merge pull request #23445 from owncloud/enc_small_improvementFrank Karlitschek2016-03-311-1/+1
|\ \ \ \ | | | | | | | | | | small performance improvement: no need to calculate the header size
| * | | | no need to calculate the header size, if the first block contain a header we ↵Bjoern Schiessle2016-03-211-1/+1
| | | | | | | | | | | | | | | | | | | | already know the size
* | | | | Merge pull request #23707 from owncloud/make-sure-that-encrypted-version-is-setFrank Karlitschek2016-03-311-2/+7
|\ \ \ \ \ | | | | | | | | | | | | Make sure that the encrypted version is set
| * | | | | Make sure that the encrypted version is setLukas Reschke2016-03-311-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #23675 from ↵Frank Karlitschek2016-03-316-62/+159
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/fix_encryption_versions_on_external_storages fix creation of versions of encrypted files on external storages
| * | | | | | fix creation of versions of encrypted files on external storagesBjoern Schiessle2016-03-316-62/+159
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #23526 from owncloud/fix_23337Frank Karlitschek2016-03-318-2/+77
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add setId and setProviderId to IShare interface
| * | | | | Move OCP\Share over to PSR-4Roeland Jago Douma2016-03-307-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Touching the code so moving it over to PSR-4
| * | | | | Add setId and setProviderID to the public interfaceRoeland Jago Douma2016-03-303-2/+77
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Fixes #23337 We only allow the id to be set once!
* / | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-314-2/+34
|/ / / /
* | | | Merge pull request #23628 from owncloud/avatar-removeThomas Müller2016-03-301-1/+1
|\ \ \ \ | | | | | | | | | | only remove avatars from the folder we store them in
| * | | | only remove avatars from the folder we store them inRobin Appelman2016-03-301-1/+1
| | | | |
* | | | | Merge pull request #23654 from owncloud/issue-23653-xcache-detection-failsThomas Müller2016-03-301-1/+1
|\ \ \ \ \ | | | | | | | | | | | | xcache.var_size with 64M should evaluate to isAvailable
| * | | | | xcache.var_size with 64M should evaluate to isAvailableJoas Schilling2016-03-301-1/+1
| | | | | |
* | | | | | Non moveable mount points should always be UPDATE+DELETE shareableRoeland Jago Douma2016-03-301-1/+13
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #23536 The new sharing code is much stricter in checking permissions. However for non moveable mounts the permissions UPDATE+DELETE are not reported on the mount point. This is just a quick fix. * Updated unit tests
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-302-0/+2
| | | | |
* | | | | Merge pull request #23543 from owncloud/issue-23503-activity-emails-always-shortThomas Müller2016-03-292-2/+31
|\ \ \ \ \ | |/ / / / |/| | | | Fix activity emails always using the short translation
| * | | | Allow the activity app to set the current user when sending emailsJoas Schilling2016-03-242-1/+29
| | | | |
| * | | | We are only formatting an object when it's not nullJoas Schilling2016-03-241-1/+2
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-292-0/+2
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-284-0/+50
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2710-12/+48
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-264-0/+10
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-258-2/+22
| | | | |
* | | | | Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removalThomas Müller2016-03-241-0/+4
|\ \ \ \ \ | | | | | | | | | | | | Lock the mountpoint while removing
| * | | | | Lock the mountpoint while removingJoas Schilling2016-03-241-0/+4
| | | | | |
* | | | | | Merge pull request #23154 from owncloud/avatar-save-failureThomas Müller2016-03-243-6/+24
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | dont die when we cant save the resized avatar, log instead
| * | | | | dont die when we cant save the resized avatar, log insteadRobin Appelman2016-03-113-6/+24
| | | | | |
* | | | | | add missing varJörn Friedrich Dreyer2016-03-241-0/+4
| | | | | |
* | | | | | Merge pull request #23542 from ↵Thomas Müller2016-03-241-3/+6
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | owncloud/catch-empty-app-path-oh-we-really-should-use-exceptions-in-the-future getAppPath can return false
| * | | | | getAppPath can return falseLukas Reschke2016-03-241-3/+6
| | |/ / / | |/| | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23533
* / | | | Check if request is sent from official ownCloud clientLukas Reschke2016-03-241-0/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | There are authentication backends such as Shibboleth that do send no Basic Auth credentials for DAV requests. This means that the ownCloud DAV backend would consider these requests coming from an untrusted source and require higher levels of security checks. (e.g. a CSRF check) While an elegant solution would rely on authenticating via token (so that one can properly ensure that the request came indeed from a trusted client) this is a okay'ish workaround for this problem until we have something more reliable in the authentication code.
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2488-276/+244
| | | |