summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-214-12/+14
|
* Merge pull request #13499 from owncloud/issue/13451-redis-json-encodeThomas Müller2015-01-201-4/+4
|\ | | | | Issue/13451 redis json encode
| * Json_(en|de)code values on redis to be able to cache arraysJoas Schilling2015-01-201-4/+4
| |
* | Fix WebDAV auth for session authentication onlyLukas Reschke2015-01-202-3/+5
|/ | | | | | | | | | \Sabre\DAV\Auth\Backend\AbstractBasic::authenticate was only calling \OC_Connector_Sabre_Auth::validateUserPass when the response of \Sabre\HTTP\BasicAuth::getUserPass was not null. However, there is a case where the value can be null and the user could be authenticated anyways: The authentication via ownCloud web-interface and then accessing WebDAV resources. This was not possible anymore with this patch because it never reached the code path in this scenario. This patchs allows authenticating with a session without isDavAuthenticated value stored (this is for ugly WebDAV clients that send the cookie in any case) and thus the functionality should work again. To test this go to the admin settings and test if the WebDAV check works fine. Furthermore all the usual stuff (WebDAV / Shibboleth / etc...) needs testing as well.
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-202-0/+20
|
* Merge pull request #13416 from ↵Morris Jobke2015-01-191-11/+33
|\ | | | | | | | | owncloud/reauthenticate-if-session-differs-from-basic-auth Prioritise Basic Auth header over Cookie
| * Close session properlyLukas Reschke2015-01-191-0/+1
| |
| * Prioritise Basic Auth header over CookieLukas Reschke2015-01-171-11/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | There are a lot of clients that support multiple WebDAV accounts in the same application. However, they resent all the cookies they received from one of the accounts also to the other one. In the case of ownCloud this means that we will always show the user from the session and not the user that is specified in the basic authentication header. This patch adds a workaround the following way: 1. If the user authenticates via the Sabre Auth Connector add a hint to the session that this was authorized via Basic Auth (this is to prevent logout CSRF) 2. If the request contains this hint and the username specified in the basic auth header differs from the one in the session relogin the user using basic auth Fixes https://github.com/owncloud/core/issues/11400 and https://github.com/owncloud/core/issues/13245 and probably some other issues as well. This requires proper testing also considering LDAP / Shibboleth and whatever instances.
* | Merge pull request #13480 from owncloud/mysql-autocommitLukas Reschke2015-01-191-4/+9
|\ \ | | | | | | set MySQL autocommit on connection setup
| * | set MySQL autocommit on connection setupThomas Müller2015-01-191-4/+9
| | |
* | | Fix chunked query for tags + unit testVincent Petry2015-01-191-1/+1
|/ /
* | check is mimetype is set - fixed #13452Thomas Müller2015-01-191-1/+1
| |
* | Merge pull request #13423 from ↵Thomas Müller2015-01-191-9/+18
|\ \ | | | | | | | | | | | | owncloud/share-fixfindshareforuserwithmultiplegroups Fix getItemSharedWithUser for groups
| * | Fix getItemSharedWithUser for groupsVincent Petry2015-01-161-9/+18
| | | | | | | | | | | | | | | | | | Fixed SQL query for whenever a user has more than one group. Added missing $owner where clause for group lookup. Added unit tests for the group cases.
* | | Merge pull request #13438 from owncloud/cache-the-arrayThomas Müller2015-01-191-70/+71
|\ \ \ | | | | | | | | Reuse the array key of mimetypes
| * | | Reuse the array key of mimetypesLukas Reschke2015-01-181-70/+71
| | |/ | |/| | | | | | | | | | | | | | | | | | | This function is called a lot of times and was really slow before due to not reusing the same array. Previously when it was called 500'000 times it took about 2seconds, now we're down to 0.2 seconds on my local machine. Ref https://github.com/owncloud/core/issues/13434
* / | Fix exif orientation for flipped imagesMorris Jobke2015-01-181-5/+12
|/ / | | | | | | | | | | | | | | fixes #13363 Links: * http://www.daveperrett.com/articles/2012/07/28/exif-orientation-handling-is-a-ghetto/ * Example data: https://github.com/recurser/exif-orientation-examples
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-172-38/+168
| |
* | Merge pull request #13319 from owncloud/replace-line-breaks-in-app-descriptionLukas Reschke2015-01-171-1/+38
|\ \ | | | | | | replace line breaks in the app description by spaces - fixes #13315
| * | OC_App::parseAppInfoMorris Jobke2015-01-141-1/+38
| | | | | | | | | | | | | | | | | | * replace line breaks (on non empty lines) in the app description by spaces * fixes #13315 * includes unit tests
* | | Merge pull request #13160 from owncloud/extstorage-ocbackendnopartfileMorris Jobke2015-01-161-27/+59
|\ \ \ | |_|/ |/| | Disable part files for OC ext storage backend + s2s backend
| * | remove unused variable and fix undefined variableThomas Müller2015-01-081-5/+4
| | |
| * | Disable part files for OC ext storage backend + s2s backendVincent Petry2015-01-071-28/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading files to an OC ext storage backend or when using server to server sharing storage, part files aren't needed because the backend already has its own part files and takes care of the final atomic rename operation. This also fixes issues when using two encrypted ownCloud instances where one mounts the other either as external storage (ownCloud backend) or through server to server sharing.
* | | Merge pull request #13406 from owncloud/fix-php-docFrank Karlitschek2015-01-151-0/+1
|\ \ \ | | | | | | | | Fix PHPDoc
| * | | Fix PHPDocLukas Reschke2015-01-151-0/+1
| | | |
* | | | Merge pull request #13389 from owncloud/issue/13372-failing-oracle-tests-jenkinsThomas Müller2015-01-151-11/+29
|\ \ \ \ | |/ / / |/| | | Mask table and column names with backticks and add lastInsertID() workar...
| * | | Mask table and column names with backticks and add lastInsertID() workaroundJoas Schilling2015-01-151-11/+29
| | | |
* | | | Remove children from the cache in one queryRobin Appelman2015-01-151-24/+36
| | | |
* | | | Merge pull request #13388 from owncloud/type-hint-url-paramsMorris Jobke2015-01-151-1/+1
|\ \ \ \ | | | | | | | | | | Add PHPDoc for `urlParams`
| * | | | Add PHPDoc for `urlParams`Lukas Reschke2015-01-151-1/+1
| |/ / /
* / / / always set url parameters when they are available in the app dispatchBernhard Posselt2015-01-153-9/+18
|/ / / | | | | | | | | | | | | | | | prefer url parameters passed into the main method. If they are not present, use the containers urlParameters add space
* | | Merge pull request #13317 from owncloud/partfile-fileinfoThomas Müller2015-01-141-0/+31
|\ \ \ | | | | | | | | Return valid fileinfo objects for part files
| * | | Return valid fileinfo objects for part filesRobin Appelman2015-01-131-0/+31
| | | |
* | | | Merge pull request #13344 from owncloud/issue/13334-cleanup-tags-repairstepMorris Jobke2015-01-142-1/+117
|\ \ \ \ | | | | | | | | | | Add a repair step to clean up orphan tags and tag entries
| * | | | Add a repair step to clean up orphan tags and tag entriesJoas Schilling2015-01-142-1/+117
| | | | |
* | | | | Merge pull request #13367 from owncloud/type-hint-server-method-from-requestMorris Jobke2015-01-141-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Add PHPDoc for magic property 'server'
| * | | | | Add PHPDoc for magic property 'server'Lukas Reschke2015-01-141-1/+3
| | | | | |
* | | | | | Merge pull request #13350 from owncloud/autoload-translationsMorris Jobke2015-01-141-0/+4
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Autoload app's js translations
| * | | | | ignore coreBernhard Posselt2015-01-141-1/+4
| | | | | |
| * | | | | move check into addTranslation methodBernhard Posselt2015-01-141-11/+1
| | | | | |
| * | | | | dont load core scritpsBernhard Posselt2015-01-141-1/+3
| | | | | |
| * | | | | only load translsations for appsBernhard Posselt2015-01-141-1/+3
| | | | | |
| * | | | | make translation lookup faster (O(n) -> O(1))Bernhard Posselt2015-01-141-2/+2
| | | | | |
| * | | | | autoload app's js translationsBernhard Posselt2015-01-141-0/+7
| | | | | |
* | | | | | Check new and old ways of required oC version for app compatibilityJoas Schilling2015-01-142-2/+8
|/ / / / /
* | | | | Merge pull request #13311 from owncloud/fix_restore_keysBjörn Schießle2015-01-141-4/+4
|\ \ \ \ \ | |/ / / / |/| | | | adapt decrypt all to the new folder structure
| * | | | adapt decrypt all and restore/delete key backups to the new folder structure ↵Bjoern Schiessle2015-01-131-4/+4
| | | | | | | | | | | | | | | | | | | | for encryption key introduced with OC8
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-142-0/+18
| | | | |
* | | | | Merge pull request #13320 from owncloud/fix-php-doc-for-files-viewMorris Jobke2015-01-131-1/+11
|\ \ \ \ \ | | | | | | | | | | | | Fix annotations in file view
| * | | | | drop unused parameterMorris Jobke2015-01-131-2/+1
| | | | | |