Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24748 from owncloud/login-explicitly | Vincent Petry | 2016-05-24 | 7 | -18/+43 |
|\ | |||||
| * | when generating browser/device token, save the login name for later password ... | Christoph Wurst | 2016-05-24 | 7 | -10/+37 |
| * | login explicitly | Christoph Wurst | 2016-05-24 | 2 | -9/+7 |
* | | Merge pull request #24760 from owncloud/objectstore_multibucket | Vincent Petry | 2016-05-24 | 2 | -2/+115 |
|\ \ | |||||
| * | | 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 | 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 | Victor Dubiniuk | 2016-05-23 | 1 | -0/+23 |
| | |/ | |/| | |||||
* | | | Merge pull request #24750 from owncloud/lenz1111-share_download_range_request... | Vincent Petry | 2016-05-23 | 2 | -12/+165 |
|\ \ \ | |||||
| * | | | Code style and doc fix | Piotr Filiciak | 2016-05-23 | 2 | -10/+10 |
| * | | | Http Range requests support in downloads | Piotr Filiciak | 2016-05-20 | 2 | -12/+165 |
* | | | | Merge pull request #24729 from owncloud/try-token-login-first | Vincent Petry | 2016-05-23 | 1 | -5/+13 |
|\ \ \ \ | |||||
| * | | | | 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 is disabled | Christoph Wurst | 2016-05-23 | 1 | -3/+4 |
* | | | | | | Merge pull request #24559 from owncloud/2fa | Vincent Petry | 2016-05-23 | 9 | -3/+283 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | 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 | 9 | -3/+258 |
| |/ / / / | |||||
* | | | | | 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 | Robin Appelman | 2016-05-23 | 1 | -2/+4 |
* | | | | | | Merge pull request #24699 from owncloud/background-scan-recursion | Vincent Petry | 2016-05-23 | 1 | -3/+6 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Only recurse into incomplete folders during background scans | Robin Appelman | 2016-05-23 | 1 | -3/+6 |
* | | | | | | | Merge pull request #24695 from owncloud/background-scan-propagate | Vincent Petry | 2016-05-23 | 1 | -1/+13 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 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 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | |||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | |||||
| * | | | | | | 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 |
| * | | | | | | Scanner must normalize new children names for cache diff | Vincent Petry | 2016-05-20 | 1 | -1/+1 |
| * | | | | | | Add encoding wrapper as opt-in mount option | Vincent Petry | 2016-05-20 | 1 | -4/+2 |
| * | | | | | | 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 | mmccarn | 2016-05-23 | 1 | -10/+13 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #24603 from owncloud/federated_reshare | Vincent Petry | 2016-05-23 | 4 | -9/+28 |
|\ \ \ \ \ | |||||
| * | | | | | use share initiator as fall back to access the file | Björn Schießle | 2016-05-20 | 4 | -9/+28 |
| | |/ / / | |/| | | | |||||
* | | | | | 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 | Robin Appelman | 2016-04-29 | 1 | -22/+25 |
* | | | | | Merge pull request #24696 from owncloud/lock-jobs-while-executing | Vincent Petry | 2016-05-21 | 7 | -36/+149 |
|\ \ \ \ \ | |||||
| * | | | | | Lock jobs while executing them, to allow multiple executors to run in parallel | Joas Schilling | 2016-05-21 | 2 | -34/+58 |
| * | | | | | Add a method to lock a table | Joas Schilling | 2016-05-21 | 5 | -2/+91 |
| | |/ / / | |/| | | | |||||
* | | | | | Some tweaks for systemtagmanager | Vincent Petry | 2016-05-20 | 1 | -4/+1 |
* | | | | | Act on effective system tag canAssign permission | Vincent Petry | 2016-05-20 | 1 | -1/+1 |