Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add more tests for OC\Core\Controller\LostController | Julius Haertl | 2016-05-23 | 1 | -3/+104 |
| | | | | | | | | - remove testResetFormUnsuccessful as it is now splitted up in different test cases - add testResetFormInvalidToken to check if timestamp and token are present - add testResetFormInvalidTokenMatch to check if the saved token matches the provided - add testResetFormExpiredToken to check if expiration detection works - add testResetFormValidToken to check if detection of valid tokens works | ||||
* | Show error messages if a password reset link is invalid or expired | Julius Haertl | 2016-05-23 | 1 | -15/+35 |
| | | | | | - Moved token validation to method checkPasswordResetToken - Render error with message from exceptions | ||||
* | 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 again… | ||||
| * | ensure comments-href returns a value also when propfind is done against ↵ | Arthur Schiwon | 2016-05-20 | 2 | -4/+5 |
| | | | | | | | | remote.php/files | ||||
* | | 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 | 2 | -2/+3 |
|\ \ \ | | | | | | | | | Make sure we evaluate installed everywhere as a boolean | ||||
| * | | | 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 … | ||||
| * | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | Personal settings auth tokens | ||||
| * | | | | | 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 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 4 | -44/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 4 | -16/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 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 | ||||
| * | | | | | | 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 #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 #24514 from owncloud/federation-psr4 | Vincent Petry | 2016-05-23 | 23 | -11/+21 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Move federation app to PSR-4 | ||||
| * | | | | | | | 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 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | flat federated re-share | ||||
| * | | | | | | | remove reshares and the mapping in the federated_reshares table on unshare ↵ | Björn Schießle | 2016-05-20 | 1 | -1/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from self | ||||
| * | | | | | | | add missung return value | Björn Schießle | 2016-05-20 | 1 | -3/+4 |
| | | | | | | | | |||||
| * | | | | | | | improved error messages | Björn Schießle | 2016-05-20 | 3 | -21/+27 |
| | | | | | | | | |||||
| * | | | | | | | move motifier from the files_sharing app to the federatedfilessharing app | Björn Schießle | 2016-05-20 | 3 | -13/+18 |
| | | | | | | | | |||||
| * | | | | | | | fall back to old re-sharing behaviour in case the remote server doesn't ↵ | Björn Schießle | 2016-05-20 | 2 | -35/+70 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | support flat-reshares | ||||
| * | | | | | | | update share permissions | Björn Schießle | 2016-05-20 | 4 | -13/+57 |
| | | | | | | | | |||||
| * | | | | | | | use share initiator as fall back to access the file | Björn Schießle | 2016-05-20 | 12 | -24/+111 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
| * | | | | | | | close cursor after select to avoid db lock | Björn Schießle | 2016-05-20 | 1 | -0/+1 |
| | | | | | | | | |||||
| * | | | | | | | create re-share by owner and propagate unshare and unshare-from self request | Björn Schießle | 2016-05-20 | 15 | -125/+815 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | correctly accross share owner and share initiator | ||||
| * | | | | | | | use query builder for getShare and add tests | Björn Schießle | 2016-05-20 | 3 | -11/+100 |
| | | | | | | | | |||||
| * | | | | | | | move request handler for federated shares to the federated sharing app | Björn Schießle | 2016-05-20 | 4 | -11/+156 |
| | |_|_|_|_|/ | |/| | | | | | |||||
* | | | | | | | 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 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #22620 from owncloud/comments-api | Vincent Petry | 2016-05-23 | 9 | -75/+165 |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | Comments API is missing hook/event to allow other apps to register valid entities | ||||
| * | | | | | | | Move EntityEvent to PSR-4 | Joas Schilling | 2016-05-23 | 1 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Fix unit tests | Joas Schilling | 2016-05-23 | 3 | -30/+37 |
| | | | | | | | | |||||
| * | | | | | | | Make the root collection neutral so it does not only work for files | Joas Schilling | 2016-05-23 | 5 | -30/+123 |
| | | | | | | | | |||||
| * | | | | | | | Remove unused UserFolder | Joas Schilling | 2016-05-23 | 2 | -15/+5 |
|/ / / / / / / | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-05-23 | 38 | -8/+70 |
| | | | | | | |