Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #25046 from owncloud/fix-the-realm | Vincent Petry | 2016-06-10 | 4 | -4/+16 |
|\ | | | | | Use the correct realm for basic authentication | ||||
| * | Use the correct realm for basic authentication - fixes #23427 | Thomas Müller | 2016-06-09 | 4 | -4/+16 |
| | | |||||
* | | Merge pull request #25048 from owncloud/email-login-leak | Vincent Petry | 2016-06-10 | 2 | -10/+43 |
|\ \ | | | | | | | Do not leak the login name | ||||
| * | | Do not leak the login name - fixes #25047 | Thomas Müller | 2016-06-09 | 2 | -10/+43 |
| | | | |||||
* | | | Merge pull request #25043 from owncloud/webdav-download-mimetype | Vincent Petry | 2016-06-10 | 6 | -5/+93 |
|\ \ \ | | | | | | | | | DAV now returns file name with Content-Disposition header | ||||
| * | | | DAV now returns file name with Content-Disposition header | Vincent Petry | 2016-06-09 | 6 | -5/+93 |
| | | | | | | | | | | | | | | | | | | | | Fixes issue where Chrome would append ".txt" to XML files when downloaded in the web UI | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-10 | 64 | -14/+280 |
| | | | | |||||
* | | | | Merge pull request #25000 from owncloud/fix-email-login-dav | Vincent Petry | 2016-06-09 | 3 | -7/+18 |
|\ \ \ \ | | | | | | | | | | | Allow login by email address via webdav as well | ||||
| * | | | | Allow login by email address via webdav as well - fixes #24791 | Thomas Müller | 2016-06-09 | 3 | -7/+18 |
| | | | | | |||||
* | | | | | Merge pull request #25008 from owncloud/externals_test_with_origin | Vincent Petry | 2016-06-09 | 8 | -18/+27 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Add support to know where the storage test comes from | ||||
| * | | | | Change the default value to true instead of null | Juan Pablo Villafáñez | 2016-06-08 | 5 | -8/+8 |
| | | | | | |||||
| * | | | | Fix test | Juan Pablo Villafáñez | 2016-06-07 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Rename variable | Juan Pablo Villafáñez | 2016-06-07 | 7 | -20/+20 |
| | | | | | |||||
| * | | | | Add support to know where the storage test comes from | Juan Pablo Villafáñez | 2016-06-07 | 7 | -16/+24 |
| | | | | | |||||
* | | | | | Merge pull request #25036 from owncloud/jnweiger-patch-1 | Vincent Petry | 2016-06-09 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Update autotest.sh | ||||
| * | | | | Update autotest.sh | Jürgen Weigert | 2016-06-08 | 1 | -1/+1 |
| | |/ / | |/| | | | | | | usage in sync with reality. | ||||
* | | | | Fix the FIXME (#25022) | Joas Schilling | 2016-06-09 | 1 | -2/+1 |
| |_|/ |/| | | |||||
* | | | Merge pull request #25014 from owncloud/admin-datadircheck-fix | Vincent Petry | 2016-06-09 | 4 | -16/+31 |
|\ \ \ | | | | | | | | | Use temporary htaccesstest.txt for data dir security check | ||||
| * | | | Use temporary htaccesstest.txt for data dir security check | Vincent Petry | 2016-06-07 | 4 | -16/+31 |
| | | | | |||||
* | | | | Merge pull request #24973 from owncloud/token-password-session-token | Vincent Petry | 2016-06-09 | 2 | -26/+165 |
|\ \ \ \ | | | | | | | | | | | When creating a session token, make sure it's the login password and … | ||||
| * | | | | catch sessionnotavailable exception if memory session is used | Christoph Wurst | 2016-06-08 | 1 | -5/+10 |
| | | | | | |||||
| * | | | | When creating a session token, make sure it's the login password and not a ↵ | Christoph Wurst | 2016-06-08 | 2 | -29/+163 |
| | | | | | | | | | | | | | | | | | | | | device token | ||||
* | | | | | Merge pull request #24826 from owncloud/cors-client-login | Vincent Petry | 2016-06-09 | 2 | -11/+12 |
|\ \ \ \ \ | | | | | | | | | | | | | use client login method on CORS routes | ||||
| * | | | | | use client login method on CORS routes | Christoph Wurst | 2016-06-08 | 2 | -11/+12 |
| |/ / / / | |||||
* | | | | | Merge pull request #25028 from owncloud/scanner-user-not-setup | Vincent Petry | 2016-06-09 | 1 | -1/+6 |
|\ \ \ \ \ | | | | | | | | | | | | | skip scanning for a user when the user is not setup yet | ||||
| * | | | | | skip scanning for a user when the user is not setup yet | Robin Appelman | 2016-06-08 | 1 | -1/+6 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-09 | 18 | -0/+158 |
| |_|_|/ / |/| | | | | |||||
* | | | | | Merge pull request #25023 from owncloud/fix-22127-trusted-servers | Vincent Petry | 2016-06-08 | 3 | -11/+16 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed problem about removing trusted servers accidentally | ||||
| * | | | | | Removed old html | Sergio Bertolín | 2016-06-08 | 1 | -2/+3 |
| | | | | | | |||||
| * | | | | | Improve readability | Sergio Bertolín | 2016-06-08 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Fixed problem about removing trusted servers accidentally | Sergio Bertolín | 2016-06-08 | 3 | -9/+13 |
| | | | | | | |||||
* | | | | | | Merge pull request #25027 from owncloud/fix-22746-narrowtooltip | Vincent Petry | 2016-06-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added width of the tooltip | ||||
| * | | | | | | Added width of the tooltip | Sergio Bertolín | 2016-06-08 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Do not log token or challenge with exception stacktrace (#25026) | Joas Schilling | 2016-06-08 | 2 | -4/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make the filtering better readable * Add some more methods to the sensitive list | ||||
* | | | | | | Merge pull request #25012 from owncloud/gdrive-fixfilesizewithmimetypemismatch | Vincent Petry | 2016-06-08 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix GDrive file size when mime type doesn't match contents | ||||
| * | | | | | | Fix GDrive file size when mime type doesn't match contents | Vincent Petry | 2016-06-08 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uploading a txt file with XML contents makes GDrive return the XML mime type. This fix makes sure the logic that returns "SPACE_UNKNOWN" for the size properly rely on the Google Docs mime types. | ||||
* | | | | | | | Merge pull request #24974 from owncloud/htaccess_update | Vincent Petry | 2016-06-08 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | .htaccess update making two rules non-capturing | ||||
| * | | | | | | .htaccess update making two rules non-capturing | Martin | 2016-06-03 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | ownCloud 9.1.0 beta 2v9.1.0beta2v9.0.1beta2 | Daniel Molkentin | 2016-06-08 | 1 | -2/+2 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2fa | Vincent Petry | 2016-06-08 | 6 | -5/+38 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Allow to cancel 2FA after login | ||||
| * | | | | | | Allow to cancel 2FA after login | Joas Schilling | 2016-06-07 | 6 | -5/+38 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #25019 from owncloud/fix_24937 | Vincent Petry | 2016-06-08 | 1 | -0/+18 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Bring back sharedstorage hooks | ||||
| * | | | | | | Bring back sharedstorage hooks | Roeland Jago Douma | 2016-06-08 | 1 | -0/+18 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #24899 from owncloud/local-storage-symlinks | Vincent Petry | 2016-06-08 | 6 | -3/+73 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | dissalow symlinks in local storages that point outside the datadir | ||||
| * | | | | | | | Better handling of forbidden files in dav | Robin Appelman | 2016-06-07 | 2 | -0/+4 |
| | | | | | | | | |||||
| * | | | | | | | Ignore forbidden files while scanning | Robin Appelman | 2016-06-07 | 1 | -1/+6 |
| | | | | | | | | |||||
| * | | | | | | | dissalow symlinks in local storages that point outside the datadir | Robin Appelman | 2016-06-07 | 3 | -2/+63 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #24983 from ↵ | Vincent Petry | 2016-06-08 | 5 | -5/+30 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 5 | -5/+30 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #24991 from owncloud/2fa-do-not-generate-token | Vincent Petry | 2016-06-08 | 4 | -19/+61 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | do not generate device token if 2FA is enable for user |