Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24788 from owncloud/config-filesystem_check_changes | Vincent Petry | 2016-05-24 | 1 | -2/+3 |
|\ | |||||
| * | clarify filesystem_check_changes in config.sample.php | Carla Schroder | 2016-05-23 | 1 | -2/+3 |
* | | 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 | 5 | -15/+221 |
|\ \ \ \ | |||||
| * | | | | Code style and doc fix | Piotr Filiciak | 2016-05-23 | 3 | -10/+11 |
| * | | | | Http Range requests support in downloads | Piotr Filiciak | 2016-05-20 | 5 | -15/+220 |
* | | | | | 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 | 2 | -3/+51 |
|\ \ \ \ \ \ | |||||
| * | | | | | | invalidate user session if the user is disabled | Christoph Wurst | 2016-05-23 | 2 | -3/+51 |
* | | | | | | | Merge pull request #24559 from owncloud/2fa | Vincent Petry | 2016-05-23 | 27 | -8/+1471 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | |||||
| * | | | | | | add OCC command to enable/disable 2FA for a user | Christoph Wurst | 2016-05-23 | 6 | -3/+169 |
| * | | | | | | Add two factor auth to core | Christoph Wurst | 2016-05-23 | 24 | -8/+1305 |
| |/ / / / / | |||||
* | | | | | | 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 | 3 | -3/+34 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Only recurse into incomplete folders during background scans | Robin Appelman | 2016-05-23 | 3 | -3/+34 |
* | | | | | | | Merge pull request #22690 from owncloud/fix-comments-href-remote.php-files | Vincent Petry | 2016-05-23 | 2 | -4/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | ensure comments-href returns a value also when propfind is done against remot... | Arthur Schiwon | 2016-05-20 | 2 | -4/+5 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | 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 | 2 | -2/+3 |
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | |||||
| * | | | | | | | Make sure we evaluate installed like we do it everywhere | Joas Schilling | 2016-05-23 | 1 | -2/+2 |
| * | | | | | | | Make sure that installed is a boolean | Joas Schilling | 2016-05-23 | 1 | -0/+1 |
* | | | | | | | | Merge pull request #24613 from owncloud/chunked-convert-database-queries | Vincent Petry | 2016-05-23 | 1 | -14/+56 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Chunk the "db:convert-type" select queries, to not run out of memory so fast | Joas Schilling | 2016-05-13 | 1 | -14/+56 |
* | | | | | | | | | Merge pull request #24703 from owncloud/personal-settings-auth-tokens | Vincent Petry | 2016-05-23 | 19 | -10/+826 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | |||||
| * | | | | | | | | add button to invalidate browser sessions/device tokens | Christoph Wurst | 2016-05-23 | 13 | -33/+236 |
| * | | | | | | | | add button to add new device tokens | Christoph Wurst | 2016-05-23 | 8 | -24/+259 |
| * | | | | | | | | list user's auth tokens on the personal settings page | Christoph Wurst | 2016-05-23 | 13 | -6/+384 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #24349 from owncloud/nfd-storagewrapper | Vincent Petry | 2016-05-23 | 7 | -15/+771 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | |||||
| * | | | | | | | Remove unneeded unsets in encoding wrapper | Vincent Petry | 2016-05-20 | 1 | -16/+3 |
| * | | | | | | | Fixes for encoding wrapper | Vincent Petry | 2016-05-20 | 4 | -44/+72 |
| * | | | | | | | 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 | 4 | -16/+26 |
| * | | | | | | | Add wrapper for NFD encoding workaround | Vincent Petry | 2016-05-20 | 4 | -1/+732 |
* | | | | | | | | 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 #24726 from owncloud/tests-psr-4 | Vincent Petry | 2016-05-23 | 36 | -42/+55 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | 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 #24514 from owncloud/federation-psr4 | Vincent Petry | 2016-05-23 | 23 | -11/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Fix errors in the tests | Joas Schilling | 2016-05-19 | 5 | -10/+20 |
| * | | | | | | | | Move federation tests to PSR-4 | Joas Schilling | 2016-05-19 | 10 | -4/+4 |
| * | | | | | | | | Move federation code to PSR-4 | Joas Schilling | 2016-05-19 | 13 | -1/+1 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge pull request #24603 from owncloud/federated_reshare | Vincent Petry | 2016-05-23 | 29 | -468/+1604 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | remove reshares and the mapping in the federated_reshares table on unshare fr... | Björn Schießle | 2016-05-20 | 1 | -1/+34 |