Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24760 from owncloud/objectstore_multibucket | Vincent Petry | 2016-05-24 | 2 | -2/+115 |
|\ | | | | | Objectstore multibucket | ||||
| * | Store user bucket in preferences | Roeland Jago Douma | 2016-05-23 | 1 | -8/+16 |
| | | |||||
| * | Fix Name | Roeland Jago Douma | 2016-05-23 | 1 | -4/+4 |
| | | |||||
| * | Allow multibucket in objectstore | Roeland Jago Douma | 2016-05-23 | 2 | -2/+107 |
| | | |||||
* | | Merge pull request #24787 from owncloud/fix-update-issue-on-master | Vincent Petry | 2016-05-24 | 1 | -2/+7 |
|\ \ | | | | | | | Add the background jobs after the table was updated | ||||
| * | | Add the background jobs after the table was updated | Joas Schilling | 2016-05-23 | 1 | -2/+7 |
| | | | |||||
* | | | Merge pull request #23395 from owncloud/mysql-check-speedup | Vincent Petry | 2016-05-24 | 1 | -0/+23 |
|\ \ \ | | | | | | | | | Speedup schema cloning for MySQL | ||||
| * | | | Speedup schema cloning for MySQL | Victor Dubiniuk | 2016-05-23 | 1 | -0/+23 |
| | |/ | |/| | |||||
* | | | Merge pull request #24750 from ↵ | Vincent Petry | 2016-05-23 | 3 | -12/+200 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/lenz1111-share_download_range_requests_support Http Range requests support in downloads | ||||
| * | | | Code style and doc fix | Piotr Filiciak | 2016-05-23 | 3 | -10/+11 |
| | | | | |||||
| * | | | Http Range requests support in downloads | Piotr Filiciak | 2016-05-20 | 3 | -12/+199 |
| | | | | | | | | | | | | | | | | Http range requests support is required for video preview | ||||
* | | | | Merge pull request #24729 from owncloud/try-token-login-first | Vincent Petry | 2016-05-23 | 1 | -5/+13 |
|\ \ \ \ | | | | | | | | | | | try token login first | ||||
| * | | | | try token login first | Christoph Wurst | 2016-05-20 | 1 | -5/+13 |
| | | | | | |||||
* | | | | | Merge pull request #24658 from owncloud/invalidate-disabled-user-session | Vincent Petry | 2016-05-23 | 1 | -3/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | invalidate user session if the user was disabled | ||||
| * | | | | | invalidate user session if the user is disabled | Christoph Wurst | 2016-05-23 | 1 | -3/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #24559 from owncloud/2fa | Vincent Petry | 2016-05-23 | 10 | -3/+376 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | two factor auth | ||||
| * | | | | | add OCC command to enable/disable 2FA for a user | Christoph Wurst | 2016-05-23 | 2 | -3/+28 |
| | | | | | | |||||
| * | | | | | Add two factor auth to core | Christoph Wurst | 2016-05-23 | 10 | -3/+351 |
| |/ / / / | |||||
* | | | | | Merge pull request #24777 from owncloud/scanner-dont-propagate | Vincent Petry | 2016-05-23 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | dont needlessly triger the propgator in the scanner | ||||
| * | | | | | dont needlessly triger the propgator in the scanner | Robin Appelman | 2016-05-23 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | Merge pull request #24699 from owncloud/background-scan-recursion | Vincent Petry | 2016-05-23 | 2 | -3/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Only recurse into incomplete folders during background scans | ||||
| * | | | | | | Only recurse into incomplete folders during background scans | Robin Appelman | 2016-05-23 | 2 | -3/+7 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #24695 from owncloud/background-scan-propagate | Vincent Petry | 2016-05-23 | 1 | -1/+13 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Trigger propagation from the background scanner | ||||
| * | | | | | | | Trigger propagation from the background scanner | Robin Appelman | 2016-05-18 | 1 | -1/+13 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #24765 from owncloud/boolean-installed-config | Vincent Petry | 2016-05-23 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | Make sure we evaluate installed everywhere as a boolean | ||||
| * | | | | | | | Make sure that installed is a boolean | Joas Schilling | 2016-05-23 | 1 | -0/+1 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #24703 from owncloud/personal-settings-auth-tokens | Vincent Petry | 2016-05-23 | 6 | -6/+51 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | Personal settings auth tokens | ||||
| * | | | | | | | add button to invalidate browser sessions/device tokens | Christoph Wurst | 2016-05-23 | 5 | -6/+37 |
| | | | | | | | | |||||
| * | | | | | | | add button to add new device tokens | Christoph Wurst | 2016-05-23 | 2 | -1/+4 |
| | | | | | | | | |||||
| * | | | | | | | list user's auth tokens on the personal settings page | Christoph Wurst | 2016-05-23 | 2 | -2/+13 |
| |/ / / / / / | |||||
* | | | | | | | Merge pull request #24349 from owncloud/nfd-storagewrapper | Vincent Petry | 2016-05-23 | 3 | -1/+541 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Add wrapper for NFD encoding workaround | ||||
| * | | | | | | Remove unneeded unsets in encoding wrapper | Vincent Petry | 2016-05-20 | 1 | -16/+3 |
| | | | | | | | |||||
| * | | | | | | Fixes for encoding wrapper | Vincent Petry | 2016-05-20 | 1 | -41/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improved label Fixed rename/copy/moveFromStorage/copyFromStorage and added tests Improved findPathToUse algo | ||||
| * | | | | | | Scanner must normalize new children names for cache diff | Vincent Petry | 2016-05-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since new children from the storage might contain NFD entries, these must be normalized to NFC to be properly diff'ed with the cache contents which is always NFC. This fixes an issue where NFD entries would disappear from the cache after rescannng for children. | ||||
| * | | | | | | Add encoding wrapper as opt-in mount option | Vincent Petry | 2016-05-20 | 1 | -4/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The encoding wrapper is now only applied when the mount option is set, disabled by default. | ||||
| * | | | | | | Add wrapper for NFD encoding workaround | Vincent Petry | 2016-05-20 | 2 | -0/+577 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #24766 from owncloud/mmccarn-patch-2 | Vincent Petry | 2016-05-23 | 1 | -10/+13 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Update imagePath to prefer theme, then app, then core images | ||||
| * | | | | | | Update imagePath to prefer theme, then app, then core images | mmccarn | 2016-05-23 | 1 | -10/+13 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | imagePath updated so that image searches follow this priority: 1) /themes/$theme/apps/$app/img 2) /themes/$theme/$app/img 3) /themes/$theme/core/img 4) $appPath/img 5) /$app/img 6) /core/img For each folder: - if the specified file exists, use it. - otherwise, if $basename.svg does NOT exist, try $basename.png (This might better be "if filename was an svg, try the png"...) | ||||
* | | | | | | Merge pull request #24603 from owncloud/federated_reshare | Vincent Petry | 2016-05-23 | 4 | -9/+28 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | flat federated re-share | ||||
| * | | | | | | use share initiator as fall back to access the file | Björn Schießle | 2016-05-20 | 4 | -9/+28 |
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | 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 #24356 from owncloud/scanner-recursion-memory | Vincent Petry | 2016-05-23 | 1 | -22/+25 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Free up folder content from memory before recursing in the file scanner | ||||
| * | | | | | | Free up folder content from memory before recursing in the file scanner | Robin Appelman | 2016-04-29 | 1 | -22/+25 |
| | | | | | | | |||||
* | | | | | | | Move EntityEvent to PSR-4 | Joas Schilling | 2016-05-23 | 1 | -0/+0 |
| | | | | | | | |||||
* | | | | | | | Make the root collection neutral so it does not only work for files | Joas Schilling | 2016-05-23 | 1 | -0/+76 |
| |_|/ / / / |/| | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-23 | 8 | -8/+24 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-22 | 4 | -12/+20 |
| | | | | | | |||||
* | | | | | | Merge pull request #24732 from owncloud/autoloader_fix | Vincent Petry | 2016-05-21 | 3 | -7/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Autoloader fix | ||||
| * | | | | | | Move Template to PSR-4 | Roeland Jago Douma | 2016-05-20 | 1 | -0/+0 |
| | | | | | | | |||||
| * | | | | | | Only allow loading of legacy (lib/private/legacy) by default | Roeland Jago Douma | 2016-05-20 | 1 | -5/+1 |
| | | | | | | | |||||
| * | | | | | | \OCP is handled by composer autoloader | Roeland Jago Douma | 2016-05-20 | 1 | -2/+0 |
| | |/ / / / | |/| | | | |