Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24760 from owncloud/objectstore_multibucket | Vincent Petry | 2016-05-24 | 2 | -0/+294 |
|\ | | | | | Objectstore multibucket | ||||
| * | Store user bucket in preferences | Roeland Jago Douma | 2016-05-23 | 1 | -8/+82 |
| | | |||||
| * | Fix Name | Roeland Jago Douma | 2016-05-23 | 1 | -3/+3 |
| | | |||||
| * | Add unit tests for ObjectHomeMountProvider | Roeland Jago Douma | 2016-05-23 | 1 | -0/+170 |
| | | |||||
| * | Add mapper unit tests | Roeland Jago Douma | 2016-05-23 | 1 | -0/+50 |
| | | |||||
* | | Merge pull request #24658 from owncloud/invalidate-disabled-user-session | Vincent Petry | 2016-05-23 | 1 | -0/+47 |
|\ \ | | | | | | | invalidate user session if the user was disabled | ||||
| * | | invalidate user session if the user is disabled | Christoph Wurst | 2016-05-23 | 1 | -0/+47 |
| | | | |||||
* | | | Merge pull request #24559 from owncloud/2fa | Vincent Petry | 2016-05-23 | 5 | -2/+629 |
|\ \ \ | |_|/ |/| | | two factor auth | ||||
| * | | Add two factor auth to core | Christoph Wurst | 2016-05-23 | 5 | -2/+629 |
| |/ | |||||
* | | Only recurse into incomplete folders during background scans | Robin Appelman | 2016-05-23 | 1 | -0/+27 |
| | | |||||
* | | Merge pull request #24703 from owncloud/personal-settings-auth-tokens | Vincent Petry | 2016-05-23 | 3 | -0/+194 |
|\ \ | | | | | | | Personal settings auth tokens | ||||
| * | | add button to invalidate browser sessions/device tokens | Christoph Wurst | 2016-05-23 | 3 | -0/+53 |
| | | | |||||
| * | | add button to add new device tokens | Christoph Wurst | 2016-05-23 | 1 | -1/+76 |
| | | | |||||
| * | | list user's auth tokens on the personal settings page | Christoph Wurst | 2016-05-23 | 1 | -0/+66 |
| | | | |||||
* | | | Merge pull request #24349 from owncloud/nfd-storagewrapper | Vincent Petry | 2016-05-23 | 1 | -0/+203 |
|\ \ \ | |_|/ |/| | | Add wrapper for NFD encoding workaround | ||||
| * | | Fixes for encoding wrapper | Vincent Petry | 2016-05-20 | 1 | -0/+49 |
| | | | | | | | | | | | | | | | | | | Improved label Fixed rename/copy/moveFromStorage/copyFromStorage and added tests Improved findPathToUse algo | ||||
| * | | Add wrapper for NFD encoding workaround | Vincent Petry | 2016-05-20 | 1 | -0/+154 |
| | | | |||||
* | | | Merge pull request #24726 from owncloud/tests-psr-4 | Vincent Petry | 2016-05-23 | 36 | -42/+55 |
|\ \ \ | | | | | | | | | Tests outside of tests/lib/ to PSR-4 | ||||
| * | | | Move tests/settings to PSR-4 | Joas Schilling | 2016-05-19 | 10 | -21/+32 |
| | | | | |||||
| * | | | Move tests/core/ to PSR-4 | Joas Schilling | 2016-05-19 | 26 | -21/+23 |
| | | | | |||||
* | | | | Merge pull request #24603 from owncloud/federated_reshare | Vincent Petry | 2016-05-23 | 3 | -5/+11 |
|\ \ \ \ | |_|_|/ |/| | | | flat federated re-share | ||||
| * | | | use share initiator as fall back to access the file | Björn Schießle | 2016-05-20 | 3 | -5/+11 |
| | | | | | | | | | | | | | | | | | | | | in case of federated re-shares the owner can be a remote user. Therefore we can't always use to owner to access the local file | ||||
* | | | | Merge pull request #24732 from owncloud/autoloader_fix | Vincent Petry | 2016-05-21 | 1 | -15/+1 |
|\ \ \ \ | | | | | | | | | | | Autoloader fix | ||||
| * | | | | Fix unit tests | Roeland Jago Douma | 2016-05-20 | 1 | -15/+1 |
| |/ / / | |||||
* | | | | Merge pull request #24696 from owncloud/lock-jobs-while-executing | Vincent Petry | 2016-05-21 | 1 | -66/+60 |
|\ \ \ \ | | | | | | | | | | | Lock jobs while executing them, to allow multiple executors to run in… | ||||
| * | | | | Lock jobs while executing them, to allow multiple executors to run in parallel | Joas Schilling | 2016-05-21 | 1 | -66/+60 |
| |/ / / | |||||
* | | | | Act on effective system tag canAssign permission | Vincent Petry | 2016-05-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever the server returns true for the can-assign Webdav property of a system tag, it means the current user is allowed to assign, regardless of the value of user-assignable. This commit brings the proper logic to the web UI to make it possible for users to assign when they have the permission. | ||||
* | | | | Add system tag assignability check with groups | Vincent Petry | 2016-05-20 | 1 | -1/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | Whenever a user is not an admin, a tag is visible but not user-assignable, check whether the user is a member of the allowed groups. | ||||
* | | | | Add systemtag_group table and get/set methods | Vincent Petry | 2016-05-20 | 1 | -0/+17 |
| | | | | | | | | | | | | | | | | | | | | Added systemtag to group mapping table. Added methods in ISystemTagManager to get/set the group mappings. | ||||
* | | | | Updated canUser* functions in SystemTagManager to accept objects | Vincent Petry | 2016-05-20 | 1 | -29/+15 |
| | | | | |||||
* | | | | Add interface methods for permission check | Vincent Petry | 2016-05-20 | 1 | -0/+82 |
|/ / / | | | | | | | | | | | | | | | | Instead of checking for admin perm, use interface method canUserAssignTag and canUserSeeTag to check for permissions. Allows for more flexible implementation. | ||||
* | / | Move tests/ to PSR-4 (#24731) | Joas Schilling | 2016-05-20 | 256 | -178/+171 |
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move a-b to PSR-4 * Move c-d to PSR-4 * Move e+g to PSR-4 * Move h-l to PSR-4 * Move m-r to PSR-4 * Move s-u to PSR-4 * Move files/ to PSR-4 * Move remaining tests to PSR-4 * Remove Test\ from old autoloader | ||||
* | | Merge pull request #24728 from owncloud/no-more-test_-files | Vincent Petry | 2016-05-20 | 3 | -5/+7 |
|\ \ | | | | | | | Fix autoloader for Test* files | ||||
| * | | Add PSR-4 loading for Test\ and Tests\ | Joas Schilling | 2016-05-19 | 1 | -0/+2 |
| | | | |||||
| * | | Create a Fallback in the old autoloader for PSR-4 Test\TestCase | Joas Schilling | 2016-05-19 | 2 | -0/+6 |
| | | | |||||
| * | | No more Test_* files exist, remove autoloading | Joas Schilling | 2016-05-19 | 1 | -6/+0 |
| | | | |||||
* | | | Merge pull request #24725 from owncloud/ocs-provider-psr4 | Vincent Petry | 2016-05-19 | 2 | -7/+11 |
|\ \ \ | |/ / |/| | | Move OCS Provider to PSR-4 namespace | ||||
| * | | Move OCS Provider to PSR-4 namespace | Joas Schilling | 2016-05-19 | 2 | -7/+11 |
| |/ | |||||
* | | Merge pull request #24660 from owncloud/no-token-login-for-disabled-users | Vincent Petry | 2016-05-19 | 1 | -0/+32 |
|\ \ | | | | | | | don't allow token login for disabled users | ||||
| * | | don't allow token login for disabled users | Christoph Wurst | 2016-05-18 | 1 | -0/+32 |
| |/ | |||||
* | | Merge pull request #24716 from owncloud/fix-test-namespaces-2 | Vincent Petry | 2016-05-19 | 78 | -406/+527 |
|\ \ | | | | | | | Fix test namespaces [files-] | ||||
| * | | Fix renamed class | Joas Schilling | 2016-05-19 | 1 | -3/+3 |
| | | | |||||
| * | | Fix more failures | Joas Schilling | 2016-05-19 | 2 | -3/+3 |
| | | | |||||
| * | | Fix deprecated private method | Joas Schilling | 2016-05-19 | 1 | -2/+2 |
| | | | |||||
| * | | Fix missing backtick before OC | Joas Schilling | 2016-05-19 | 1 | -1/+1 |
| | | | |||||
| * | | Fix "Class 'Test\Security\DateTime' not found" | Joas Schilling | 2016-05-19 | 1 | -5/+5 |
| | | | |||||
| * | | Fix lib/ | Joas Schilling | 2016-05-19 | 16 | -46/+84 |
| | | | |||||
| * | | FIx lib/ a-d | Joas Schilling | 2016-05-19 | 12 | -42/+56 |
| | | | |||||
| * | | Fix namespace in user/ | Joas Schilling | 2016-05-19 | 5 | -6/+14 |
| | | | |||||
| * | | Fix namespace in share/ | Joas Schilling | 2016-05-19 | 5 | -253/+263 |
| | | |