summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13509 from owncloud/share-deletechildrenwhenunsharefromgroupMorris Jobke2015-01-223-9/+68
|\ | | | | Fix reshare permission change to not impair other deletion code
| * Fix reshare permission change to not impair other deletion codeVincent Petry2015-01-223-9/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A recent change that prevents reshare permission changes to delete group share children had the side-effect of also preventing group share children deletion when it needed to be done. This fix adds an extra flag to isolate the "reshare permission change" deletion case and keep the other ones as they were before, not only to fix the regression but also fix other potential regressions in code that uses this method. Also updated the comment because now Helper::delete() is no longer limited to reshares but also applies to group share children.
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-22136-236/+186
| |
* | Merge pull request #13517 from owncloud/keymanager-storageMorris Jobke2015-01-221-12/+9
|\ \ | | | | | | Bypass the view when storing encryption keys
| * | Bypass the view when storing encryption keysRobin Appelman2015-01-201-12/+9
| | |
* | | Merge pull request #13568 from owncloud/s2s_delete_shares_jenkinsMorris Jobke2015-01-224-0/+144
|\ \ \ | | | | | | | | [ignore] delete all server-to-server shares if a user gets deleted
| * | | delete all server-to-server shares if a user gets deletedBjoern Schiessle2015-01-214-0/+144
| | | |
* | | | Merge pull request #13581 from owncloud/make-naming-consistentMorris Jobke2015-01-222-2/+10
|\ \ \ \ | | | | | | | | | | Make naming of encryption app consistent
| * | | | Make naming of encryption app consistentLukas Reschke2015-01-212-2/+10
|/ / / / | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/13580
* | | | Merge pull request #13552 from owncloud/request-uri-double-slashThomas Müller2015-01-212-0/+3
|\ \ \ \ | | | | | | | | | | Remove duplicated slashes from the requested url
| * | | | Add unit testRobin Appelman2015-01-211-0/+1
| | | | |
| * | | | Remove duplicated slashes from the requested urlRobin Appelman2015-01-211-0/+2
| | | | |
* | | | | Merge pull request #13519 from Sugaroverdose/fix_#13500Thomas Müller2015-01-211-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Do not clear fields until request return success in users admin page on user creation
| * | | | | do not clear fields until request return successSugaroverdose2015-01-201-1/+2
| | | | | |
* | | | | | Merge pull request #13559 from owncloud/increase-log-table-marginMorris Jobke2015-01-211-1/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | add margin to log table - fixes #13558
| * | | | | add margin to log table - fixes #13558Morris Jobke2015-01-211-1/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #13432 from owncloud/animate_gifs_public_sharingThomas Müller2015-01-215-3/+30
|\ \ \ \ \ | | | | | | | | | | | | show animated gifs on public sharing page
| * | | | | show animated gifs on public sharing pageGeorg Ehrke2015-01-195-3/+30
| | | | | |
* | | | | | Merge pull request #13563 from owncloud/proper-titleThomas Müller2015-01-211-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | use title instead of name
| * | | | | | use title instead of nameMorris Jobke2015-01-211-1/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialogThomas Müller2015-01-213-59/+204
|\ \ \ \ \ \ | | | | | | | | | | | | | | External share dialog must properly read entered password
| * | | | | | Add unit test for external share JS dialogVincent Petry2015-01-213-58/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved external share JS code into a small plugin to make it testable. Added unit test for the external share dialog logic + ajax calls.
| * | | | | | External share dialog must properly read entered passwordVincent Petry2015-01-211-1/+2
| | | | | | |
* | | | | | | Merge pull request #13554 from owncloud/issue/13482Morris Jobke2015-01-211-0/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Set the debugoutput channel to error_log instead of echoing it
| * | | | | | | Set the debugoutput channel to error_log instead of echoing itJoas Schilling2015-01-211-0/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #13553 from owncloud/s2s-webdavmkdirfixThomas Müller2015-01-212-0/+117
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix webdav mkdir for remote shares
| * | | | | | Fixed external cache test namespaceVincent Petry2015-01-211-1/+3
| | | | | | |
| * | | | | | Fix webdav mkdir for remote sharesVincent Petry2015-01-212-0/+115
|/ / / / / /
* | | | | | 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.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-09 17:05:38 +0000