summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* use title instead of nameMorris Jobke2015-01-211-1/+1
|
* Merge pull request #13539 from owncloud/unit-tests-must-haveBernhard Posselt2015-01-211-0/+4
|\ | | | | Unit tests are a must have for any changed code
| * Unit tests are a must have for any changed codeThomas Müller2015-01-211-0/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-2126-64/+130
|
* Merge pull request #13520 from owncloud/fix-comparison-opLukas Reschke2015-01-201-1/+1
|\ | | | | this must be larger then (>), since buggy behaviour occurs when the para...
| * this must be larger then (>), since buggy behaviour occurs when the ↵Arthur Schiwon2015-01-201-1/+1
| | | | | | | | parameter is a small number
* | Merge pull request #13506 from owncloud/fix-scanner-s2s-trashbinMorris Jobke2015-01-201-1/+1
|\ \ | |/ |/| avoid $this->cache being null
| * avoid $this->cache being null - fixes #13491Thomas Müller2015-01-201-1/+1
| |
* | Merge pull request #13499 from owncloud/issue/13451-redis-json-encodeThomas Müller2015-01-202-4/+10
|\ \ | | | | | | Issue/13451 redis json encode
| * | Json_(en|de)code values on redis to be able to cache arraysJoas Schilling2015-01-201-4/+4
| | |
| * | Add a test case for memcaches to store an arrayJoas Schilling2015-01-201-0/+6
| |/
* | Merge pull request #13512 from owncloud/kill-ancient-codeLukas Reschke2015-01-201-17/+0
|\ \ | | | | | | kill ancient code
| * | kill ancient codeMorris Jobke2015-01-201-17/+0
| | |
* | | Merge pull request #13494 from owncloud/windows_warningMorris Jobke2015-01-202-5/+18
|\ \ \ | |/ / |/| | add a Windows warning
| * | add a Windows warningFrank Karlitschek2015-01-202-5/+18
| | |
* | | Merge pull request #13497 from owncloud/fix-basic-auth-for-sessionLukas Reschke2015-01-202-3/+5
|\ \ \ | |_|/ |/| | Fix WebDAV auth for session authentication only
| * | 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.
* | | Merge pull request #13454 from owncloud/improve-empty-displaynameJoas Schilling2015-01-201-2/+2
|\ \ \ | |/ / |/| | also show message for empty display name if change of it isn't allowed
| * | also show message for empty display name if change of it isn't allowedMorris Jobke2015-01-191-2/+2
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-2036-26/+220
| |/ |/|
* | Merge pull request #13416 from ↵Morris Jobke2015-01-192-13/+44
|\ \ | | | | | | | | | | | | 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-172-13/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | |
* | | | Merge pull request #13478 from owncloud/tags-chunkedqueryLukas Reschke2015-01-192-4/+30
|\ \ \ \ | | | | | | | | | | Fix chunked query for tags + unit test
| * | | | Fix chunked query for tags + unit testVincent Petry2015-01-192-4/+30
| |/ / /
* | | | Merge pull request #13471 from owncloud/fix-blog-typoLukas Reschke2015-01-192-2/+2
|\ \ \ \ | |/ / / |/| | | fix typo of blog -> changed to block
| * | | fix typo of blog -> changed to blockMorris Jobke2015-01-192-2/+2
| | | | | | | | | | | | | | | | * fixes #13460
* | | | Merge pull request #13466 from owncloud/Undefined-index-mimetype-cacheThomas Müller2015-01-191-1/+1
|\ \ \ \ | |/ / / |/| | | check if mimetype is set - fixes #13452
| * | | check is mimetype is set - fixed #13452Thomas Müller2015-01-191-1/+1
| | | |
* | | | Merge pull request #13419 from owncloud/drop-animation-user-listThomas Müller2015-01-191-7/+0
|\ \ \ \ | |/ / / |/| | | Drop the hide and show of new users in user list
| * | | Drop the hide and show of new users in user listMorris Jobke2015-01-161-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * causes the first load after the initial load to hide some users in the viewport and showing them again, but with a scrolled up viewport * causes higher load for nearly never visible effects * fixes #12962
* | | | Merge pull request #13461 from owncloud/remove-strip-slashesThomas Müller2015-01-191-2/+1
|\ \ \ \ | | | | | | | | | | Remove stripslashes() from newfolder.php
| * | | | Remove stripslashes() from newfolder.phpLukas Reschke2015-01-191-2/+1
| | | | |
* | | | | increase version. This time for realFrank Karlitschek2015-01-181-1/+1
| | | | |
* | | | | Merge pull request #13457 from owncloud/enc-skippartfilesThomas Müller2015-01-191-0/+55
|\ \ \ \ \ | |/ / / / |/| | | | Skip stray part files during initial encryption
| * | | | Add class attribute types in encryption Util classVincent Petry2015-01-191-0/+51
| | | | |
| * | | | Skip stray part files during initial encryptionVincent Petry2015-01-191-0/+4
| | | | |
* | | | | Merge pull request #13377 from owncloud/trashbin_storage_wrapperMorris Jobke2015-01-199-53/+109
|\ \ \ \ \ | | | | | | | | | | | | [trashbin] replace hook with storage wrapper
| * | | | | replace hook with storage wrapperBjoern Schiessle2015-01-199-53/+109
| | |_|_|/ | |/| | |
* | | | | Merge pull request #13423 from ↵Thomas Müller2015-01-192-9/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/share-fixfindshareforuserwithmultiplegroups Fix getItemSharedWithUser for groups
| * | | | | Fix getItemSharedWithUser for groupsVincent Petry2015-01-162-9/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #13362 from owncloud/fix-11442Thomas Müller2015-01-193-38/+92
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | LDAP Wizared: update user or group count only, when the multiselect is closed
| * | | | | coding styleArthur Schiwon2015-01-152-5/+8
| | | | | |
| * | | | | update user or group count only, when the multiselect is closedArthur Schiwon2015-01-141-4/+34
| | | | | |
| * | | | | allow to read again objectclasses and groups under certain conditionsArthur Schiwon2015-01-142-2/+31
| | | | | |
| * | | | | JS cleanupArthur Schiwon2015-01-133-34/+26
| | | | | |
* | | | | | Merge pull request #13443 from owncloud/fix-filtering-for-usersThomas Müller2015-01-192-1/+128
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Fix filtering for users when $gid is empty
| * | | | | Fix filtering for users when $gid is emptyLukas Reschke2015-01-182-1/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when $gid was empty the users were not filtered at all. Rendering the search function in the user management pretty useless. Fixes itself