Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Improved error message for failing background job | Morris Jobke | 2016-01-20 | 1 | -1/+1 | |
| | ||||||
* | Handle return code of streamCopy in WebDAV put | Morris Jobke | 2016-01-16 | 1 | -1/+9 | |
| | | | | * throw a different exception if streamCopy failed | |||||
* | Merge pull request #21666 from owncloud/smb-statcache-cap-82 | Vincent Petry | 2016-01-13 | 1 | -0/+87 | |
|\ | | | | | [8.2] cap the number of entries we cache in smb's statcache | |||||
| * | cap the number of entries we cache in smb's statcache | Robin Appelman | 2016-01-12 | 1 | -0/+87 | |
| | | ||||||
* | | Use ISession::clear | Lukas Reschke | 2016-01-10 | 1 | -3/+1 | |
| | | | | | | | | The native approach using the PHP calls will not work properly with the cryptowrapper and thus this code is effectively doing nothing at the moment. | |||||
* | | Merge pull request #21539 from endocode/kayrus/cookies_auth_fix | Thomas Müller | 2016-01-08 | 1 | -1/+4 | |
|\ \ | | | | | | | [stable8.2] Fixed double file upload on failed auth using WebDAV | |||||
| * | | Fixed double file upload on failed auth using WebDAV | kayrus | 2016-01-08 | 1 | -1/+4 | |
| |/ | | | | | | | | | Backport of this fix: https://github.com/owncloud/core/pull/21491 Fixes https://github.com/owncloud/core/issues/21486 | |||||
* | | Merge pull request #21118 from owncloud/makeurltypeconfigurable | Thomas Müller | 2016-01-08 | 1 | -2/+7 | |
|\ \ | | | | | | | [stable8.2] make swift url type configurable | |||||
| * | | add isset for optional params | Jörn Friedrich Dreyer | 2016-01-07 | 1 | -2/+3 | |
| | | | ||||||
| * | | make url type configurable | Jörn Friedrich Dreyer | 2015-12-10 | 1 | -1/+5 | |
| | | | ||||||
* | | | Merge pull request #21265 from owncloud/backport20996-remove-password-reset | Morris Jobke | 2016-01-05 | 1 | -0/+10 | |
|\ \ \ | | | | | | | | | Backport 20996 remove password reset | |||||
| * | | | Fix missing import of IUser | Joas Schilling | 2016-01-05 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Check if user isset in $_REQUEST first | Robin Appelman | 2015-12-17 | 1 | -3/+5 | |
| | | | | ||||||
| * | | | Allow specifying a custom reset-password-url | Joas Schilling | 2015-12-17 | 1 | -3/+5 | |
| | | | | | | | | | | | | | | | | | | | | Conflicts: core/js/config.php | |||||
| * | | | Remove password reset when the user can not change the password | Joas Schilling | 2015-12-17 | 1 | -0/+6 | |
| | |/ | |/| | ||||||
* | | | Do not delete background jobs, in case an exception occured | Joas Schilling | 2016-01-04 | 1 | -1/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This approach is not valid anymore. It initially was added for jobs of non existing apps. But jobs of non-existing apps can not be created so they will never be executed and so this call just catches other cases which were not intended. This reverts commit 4f4ad72460f8ef299cd1235b5774c5f121cca430. | |||||
* | | | Fix undefined HTTP_USER_AGENT | Thomas Müller | 2015-12-29 | 1 | -0/+3 | |
| | | | ||||||
* | | | Merge pull request #21313 from owncloud/scanner-skip-not-available-82 | Vincent Petry | 2015-12-24 | 1 | -2/+17 | |
|\ \ \ | | | | | | | | | [8.2] Skip unavailable storages in scanner | |||||
| * | | | also log exception | Robin Appelman | 2015-12-21 | 1 | -0/+1 | |
| | | | | ||||||
| * | | | Skip unavailable storages in scanner | Robin Appelman | 2015-12-21 | 1 | -2/+16 | |
| |/ / | ||||||
* / / | Use name of ICollection for exception message | Morris Jobke | 2015-12-16 | 1 | -1/+1 | |
|/ / | | | | | | | * fixes #21230 | |||||
* | | don't allow to create a federated share if source and target server are the same | Björn Schießle | 2015-12-14 | 2 | -2/+45 | |
| | | ||||||
* | | Merge pull request #21127 from owncloud/stable8.2-backport-21119 | Lukas Reschke | 2015-12-11 | 1 | -0/+7 | |
|\ \ | | | | | | | [stable8.2] Make AppManager->checkAppForUser more robust | |||||
| * | | Make AppManager->checkAppForUser more robust | Morris Jobke | 2015-12-10 | 1 | -0/+7 | |
| | | | | | | | | | | | | | | | * if the JSON that is stored in the DB is corrupt an error was thrown * with this change it is properly handled and the app is disabled | |||||
* | | | Merge pull request #21046 from ↵ | Thomas Müller | 2015-12-11 | 1 | -3/+9 | |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/stable8.2-catchexceptionindirectdownloadurl [stable8.2] Catch exception when querying direct download link | |||||
| * | | | Catch exception when querying direct download link | Vincent Petry | 2015-12-09 | 1 | -3/+9 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #21113 from owncloud/memcache-lock-ttl-82 | Morris Jobke | 2015-12-10 | 5 | -4/+55 | |
|\ \ \ | |_|/ |/| | | [8.2] Add ttl for redis based locking | |||||
| * | | ttl for memcache locking backends that support it | Robin Appelman | 2015-12-10 | 3 | -2/+11 | |
| | | | ||||||
| * | | Add interface for memcache backends that support setting ttl on exisiting keys | Robin Appelman | 2015-12-10 | 2 | -2/+44 | |
| | | | ||||||
* | | | Merge pull request #21112 from owncloud/db-lock-ttl-82 | Vincent Petry | 2015-12-10 | 1 | -3/+3 | |
|\ \ \ | | | | | | | | | [8.2] Remove all locks after ttl from the db | |||||
| * | | | Remove all locks after ttl from the db | Robin Appelman | 2015-12-10 | 1 | -3/+3 | |
| |/ / | ||||||
* | | | Merge pull request #21100 from owncloud/stable8.2_21005 | Vincent Petry | 2015-12-10 | 1 | -0/+5 | |
|\ \ \ | |/ / |/| | | [Stable 8.2] The ajax code path unshares a link share when updating the password | |||||
| * | | The ajax code path unshares a link share when updating the password | Roeland Jago Douma | 2015-12-10 | 1 | -0/+5 | |
| | | | | | | | | | | | | | | | In order to not mess up existing shares if the password gets verified we should first fire this validation. | |||||
* | | | Merge pull request #21099 from owncloud/stable8.2_20949 | Roeland Douma | 2015-12-10 | 1 | -4/+2 | |
|\ \ \ | | | | | | | | | [Stable 8.2] [Sharing] Properly check if a group already has access | |||||
| * | | | [Sharing] Properly check if a group already has access | Roeland Jago Douma | 2015-12-10 | 1 | -4/+2 | |
| |/ / | | | | | | | | | | | | | | | | | | | The old code check was to liberal resulting in wrong matches if a user with the same name as the group already had access. Fixes 20892 | |||||
* | | | Merge pull request #20985 from owncloud/fix-mysql-setup-unix-socket-stable8.2 | Thomas Müller | 2015-12-10 | 1 | -6/+19 | |
|\ \ \ | | | | | | | | | Add unix_socket support for mysql during initial installation - fixes… | |||||
| * | | | Add unix_socket support for mysql during initial installation - fixes #20210 | Thomas Müller | 2015-12-07 | 1 | -6/+19 | |
| | | | | ||||||
* | | | | Merge pull request #21080 from ↵ | Roeland Douma | 2015-12-10 | 3 | -6/+8 | |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | owncloud/stable8.2-share-computesharepermissions-notstore [stable8.2] Fix (re)share permission checks in a few code paths | |||||
| * | | | Add explicit check for groups excluded from sharing | Vincent Petry | 2015-12-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | Since isSharable() doesn't do the check for groups excluded from sharing, adding an explicit check in the sharing code. | |||||
| * | | | Add reshare permission checks | Vincent Petry | 2015-12-09 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added in isSharable() in incoming remote share. Added in isSharable() in regular incoming share. Added in FileInfo to make sure the proper attributes are returned to the clients. | |||||
| * | | | Compute share permissions in the view | Vincent Petry | 2015-12-09 | 2 | -5/+7 | |
| | | | | | | | | | | | | | | | | | | | | The share permissions are now computed in the View/FileInfo instead of storing them directly/permanently on the storage | |||||
* | | | | Don't load commands of apps when in maintenance mode - fixes #20939 | Thomas Müller | 2015-12-09 | 1 | -3/+6 | |
|/ / / | ||||||
* | | | Do not overwrite the language when it's just missing for one app | Joas Schilling | 2015-12-07 | 1 | -3/+7 | |
| | | | ||||||
* | | | Allow sending a share email to multiple users | Joas Schilling | 2015-12-07 | 1 | -1/+3 | |
|/ / | ||||||
* | | Check the expiration date for null | Morris Jobke | 2015-12-04 | 1 | -1/+7 | |
| | | | | | | | | | | | | * null is always less than any value -> expirationDate gets null which is "no date set" * ref https://github.com/owncloud/core/issues/20590#issuecomment-158393075 | |||||
* | | Dont die when we're missing a route | Robin Appelman | 2015-11-30 | 3 | -6/+27 | |
| | | ||||||
* | | Merge pull request #20535 from owncloud/stable8.2-fakelocking-for-mac | Vincent Petry | 2015-11-25 | 2 | -1/+196 | |
|\ \ | | | | | | | [stable8.2] Add fake locker plugin | |||||
| * | | [stable8.2] Add fake locker plugin | Lukas Reschke | 2015-11-16 | 2 | -1/+196 | |
| |/ | ||||||
* / | Add support for Redis password auth | Lukas Reschke | 2015-11-23 | 1 | -0/+3 | |
|/ | | | | | | For enhanced security it is recommended to configure Redis to only accept connections with a password. (http://redis.io/topics/security) This is especially critical since Redis supports the LUA scripting language and thus a simple SSRF vulnerability (as proven in http://benmmurphy.github.io/blog/2015/06/04/redis-eval-lua-sandbox-escape/ for example) may lead to a remote code execution. | |||||
* | Merge pull request #20432 from owncloud/cache-escape-like-82 | Vincent Petry | 2015-11-10 | 3 | -1/+4 | |
|\ | | | | | [8.2] Escape like parameter in cache operations |