Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/owncloud/core into downstream-160614 | Arthur Schiwon | 2016-06-14 | 1 | -3/+24 |
|\ | |||||
| * | fail hard if 2fa provider can not be loaded (#25061) | Christoph Wurst | 2016-06-13 | 1 | -3/+24 |
| | | |||||
* | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 | Arthur Schiwon | 2016-06-11 | 4 | -8/+514 |
|\| | |||||
| * | Merge pull request #24863 from owncloud/propagator-batching | Vincent Petry | 2016-06-10 | 1 | -0/+125 |
| |\ | | | | | | | Propagator batching for the file scanner | ||||
| | * | add tests for propagator batching | Robin Appelman | 2016-06-02 | 1 | -0/+125 |
| | | | |||||
| * | | Add not-null columns for oracle | Joas Schilling | 2016-06-10 | 1 | -0/+9 |
| | | | |||||
| * | | Repair job to fix permissions for avatars | Roeland Jago Douma | 2016-06-10 | 1 | -0/+180 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22978 On some older installations the permissions for the userRoot and the avatars are not correct. This breaks since we now use the Node API in the avatar code. This repair job makes sure that the permissions are set correctly. * Unit tests added | ||||
| * | | Merge pull request #25025 from owncloud/clear_old_calendar_shares | Vincent Petry | 2016-06-10 | 1 | -0/+160 |
| |\ \ | | | | | | | | | Add repair step to clean old calendar shares | ||||
| | * | | Add repair step to clean old calendar/contact shares | Roeland Jago Douma | 2016-06-09 | 1 | -0/+160 |
| | | | | | | | | | | | | | | | | fixes #21889 | ||||
| * | | | Do not leak the login name - fixes #25047 | Thomas Müller | 2016-06-09 | 1 | -8/+40 |
| |/ / | |||||
* | | | Merge pull request #19 from nextcloud/files-drop | Lukas Reschke | 2016-06-10 | 1 | -1/+0 |
|\ \ \ | | | | | | | | | add "hide file list" option | ||||
| * | | | add hide file list option | Bjoern Schiessle | 2016-06-09 | 1 | -1/+0 |
| | | | | |||||
* | | | | Downstream 2016-06-09 | Arthur Schiwon | 2016-06-09 | 9 | -56/+317 |
|\ \ \ \ | | |/ / | |/| | | | | | | Merge branch 'master' of https://github.com/owncloud/core into downstream-160609 | ||||
| * | | | Merge pull request #24973 from owncloud/token-password-session-token | Vincent Petry | 2016-06-09 | 1 | -24/+135 |
| |\ \ \ | | | | | | | | | | | When creating a session token, make sure it's the login password and … | ||||
| | * | | | When creating a session token, make sure it's the login password and not a ↵ | Christoph Wurst | 2016-06-08 | 1 | -24/+135 |
| | | | | | | | | | | | | | | | | | | | | device token | ||||
| * | | | | Merge pull request #24826 from owncloud/cors-client-login | Vincent Petry | 2016-06-09 | 1 | -5/+6 |
| |\ \ \ \ | | | | | | | | | | | | | use client login method on CORS routes | ||||
| | * | | | | use client login method on CORS routes | Christoph Wurst | 2016-06-08 | 1 | -5/+6 |
| | |/ / / | |||||
| * / / / | Do not log token or challenge with exception stacktrace (#25026) | Joas Schilling | 2016-06-08 | 1 | -3/+3 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | * Make the filtering better readable * Add some more methods to the sensitive list | ||||
| * | | | Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2fa | Vincent Petry | 2016-06-08 | 1 | -4/+17 |
| |\ \ \ | | | | | | | | | | | Allow to cancel 2FA after login | ||||
| | * | | | Allow to cancel 2FA after login | Joas Schilling | 2016-06-07 | 1 | -4/+17 |
| | | | | | |||||
| * | | | | Merge pull request #24899 from owncloud/local-storage-symlinks | Vincent Petry | 2016-06-08 | 1 | -0/+31 |
| |\ \ \ \ | | | | | | | | | | | | | dissalow symlinks in local storages that point outside the datadir | ||||
| | * | | | | dissalow symlinks in local storages that point outside the datadir | Robin Appelman | 2016-06-07 | 1 | -0/+31 |
| | |/ / / | |||||
| * | | | | Merge pull request #24983 from ↵ | Vincent Petry | 2016-06-08 | 1 | -0/+19 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-23776-do-not-allow-boolean-user-config Do not allow to store boolean configs, they behave unexpected on postgres | ||||
| | * | | | | Do not allow to store boolean configs, they behave unexpected on postgres | Joas Schilling | 2016-06-06 | 1 | -0/+19 |
| | | | | | | |||||
| * | | | | | Merge pull request #24991 from owncloud/2fa-do-not-generate-token | Vincent Petry | 2016-06-08 | 1 | -7/+33 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | do not generate device token if 2FA is enable for user | ||||
| | * | | | | | do not generate device token if 2FA is enable for user | Christoph Wurst | 2016-06-07 | 1 | -7/+33 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-only | Vincent Petry | 2016-06-08 | 1 | -12/+23 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | Allow to decrypt user '0' files only | ||||
| | * | | | | Allow to decrypt user '0' files only | Joas Schilling | 2016-06-07 | 1 | -12/+23 |
| | |/ / / | |||||
| * / / / | allow deleting "ghost files" trough the View and Node api | Robin Appelman | 2016-06-03 | 1 | -1/+50 |
| |/ / / | |||||
* | / / | Revert "Downstream 2016-06-08" | blizzz | 2016-06-09 | 6 | -173/+24 |
| |/ / |/| | | |||||
* | | | Allow to cancel 2FA after login | Joas Schilling | 2016-06-09 | 1 | -4/+17 |
| | | | |||||
* | | | dissalow symlinks in local storages that point outside the datadir | Robin Appelman | 2016-06-09 | 1 | -0/+31 |
| | | | |||||
* | | | Allow to decrypt user '0' files only | Joas Schilling | 2016-06-09 | 1 | -12/+23 |
| | | | |||||
* | | | do not generate device token if 2FA is enable for user | Christoph Wurst | 2016-06-09 | 1 | -7/+33 |
| | | | |||||
* | | | Do not allow to store boolean configs, they behave unexpected on postgres | Joas Schilling | 2016-06-09 | 1 | -0/+19 |
| | | | |||||
* | | | allow deleting "ghost files" trough the View and Node api | Robin Appelman | 2016-06-09 | 1 | -1/+50 |
| | | | |||||
* | | | skip failing tests | Morris Jobke | 2016-06-07 | 3 | -0/+5 |
|/ / | |||||
* | | Merge pull request #24940 from owncloud/fix-normalizedcachekey-keepunicode | Vincent Petry | 2016-06-02 | 2 | -1/+33 |
|\ \ | |/ |/| | Add keepUnicode value in the cache key of normalizedPathCache | ||||
| * | Fix TestCase::invokePrivate to work with static classes | Vincent Petry | 2016-06-01 | 1 | -1/+6 |
| | | |||||
| * | Add keepUnicode value in the cache key of normalizedPathCache | Vincent Petry | 2016-06-01 | 1 | -0/+27 |
| | | |||||
* | | remember redirect_url when solving the 2FA challenge | Christoph Wurst | 2016-06-01 | 2 | -9/+22 |
|/ | |||||
* | Create session tokens for apache auth users | Christoph Wurst | 2016-05-31 | 2 | -0/+49 |
| | |||||
* | Merge pull request #24628 from owncloud/decryptall-checkifneedsprocessing | Vincent Petry | 2016-05-31 | 1 | -3/+4 |
|\ | | | | | [decrypt_all] Check if file needs to decrypted or not for speed up large oc setups. | ||||
| * | fix unit tests | Björn Schießle | 2016-05-30 | 1 | -3/+4 |
| | | |||||
* | | Fix for #23066 (#24689) | Torben Dannhauer | 2016-05-31 | 1 | -1/+5 |
|/ | |||||
* | One more PSR-4 fix (#24852) | Joas Schilling | 2016-05-26 | 1 | -6/+6 |
| | |||||
* | Merge pull request #24604 from owncloud/user_ldap-psr4 | Vincent Petry | 2016-05-25 | 1 | -0/+3 |
|\ | | | | | Move user_ldap to PSR-4 | ||||
| * | Fix the tests again | Joas Schilling | 2016-05-25 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #24842 from owncloud/files-storage-wrapper-encoding-psr4 | Vincent Petry | 2016-05-25 | 1 | -1/+1 |
|\ \ | | | | | | | Move Test\Files\Storage\Wrapper\EncodingTest to PSR-4 | ||||
| * | | Move Test\Files\Storage\Wrapper\EncodingTest to PSR-4 | Joas Schilling | 2016-05-25 | 1 | -1/+1 |
| |/ |