summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25046 from owncloud/fix-the-realmVincent Petry2016-06-104-4/+16
|\ | | | | Use the correct realm for basic authentication
| * Use the correct realm for basic authentication - fixes #23427Thomas Müller2016-06-094-4/+16
| |
* | Merge pull request #25048 from owncloud/email-login-leakVincent Petry2016-06-102-10/+43
|\ \ | | | | | | Do not leak the login name
| * | Do not leak the login name - fixes #25047Thomas Müller2016-06-092-10/+43
| | |
* | | Merge pull request #25043 from owncloud/webdav-download-mimetypeVincent Petry2016-06-106-5/+93
|\ \ \ | | | | | | | | DAV now returns file name with Content-Disposition header
| * | | DAV now returns file name with Content-Disposition headerVincent Petry2016-06-096-5/+93
| | | | | | | | | | | | | | | | | | | | Fixes issue where Chrome would append ".txt" to XML files when downloaded in the web UI
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1064-14/+280
| | | |
* | | | Merge pull request #25000 from owncloud/fix-email-login-davVincent Petry2016-06-093-7/+18
|\ \ \ \ | | | | | | | | | | Allow login by email address via webdav as well
| * | | | Allow login by email address via webdav as well - fixes #24791Thomas Müller2016-06-093-7/+18
| | | | |
* | | | | Merge pull request #25008 from owncloud/externals_test_with_originVincent Petry2016-06-098-18/+27
|\ \ \ \ \ | |_|_|/ / |/| | | | Add support to know where the storage test comes from
| * | | | Change the default value to true instead of nullJuan Pablo Villafáñez2016-06-085-8/+8
| | | | |
| * | | | Fix testJuan Pablo Villafáñez2016-06-071-1/+2
| | | | |
| * | | | Rename variableJuan Pablo Villafáñez2016-06-077-20/+20
| | | | |
| * | | | Add support to know where the storage test comes fromJuan Pablo Villafáñez2016-06-077-16/+24
| | | | |
* | | | | Merge pull request #25036 from owncloud/jnweiger-patch-1Vincent Petry2016-06-091-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | Update autotest.sh
| * | | | Update autotest.shJürgen Weigert2016-06-081-1/+1
| | |/ / | |/| | | | | | usage in sync with reality.
* | | | Fix the FIXME (#25022)Joas Schilling2016-06-091-2/+1
| |_|/ |/| |
* | | Merge pull request #25014 from owncloud/admin-datadircheck-fixVincent Petry2016-06-094-16/+31
|\ \ \ | | | | | | | | Use temporary htaccesstest.txt for data dir security check
| * | | Use temporary htaccesstest.txt for data dir security checkVincent Petry2016-06-074-16/+31
| | | |
* | | | Merge pull request #24973 from owncloud/token-password-session-tokenVincent Petry2016-06-092-26/+165
|\ \ \ \ | | | | | | | | | | When creating a session token, make sure it's the login password and …
| * | | | catch sessionnotavailable exception if memory session is usedChristoph Wurst2016-06-081-5/+10
| | | | |
| * | | | When creating a session token, make sure it's the login password and not a ↵Christoph Wurst2016-06-082-29/+163
| | | | | | | | | | | | | | | | | | | | device token
* | | | | Merge pull request #24826 from owncloud/cors-client-loginVincent Petry2016-06-092-11/+12
|\ \ \ \ \ | | | | | | | | | | | | use client login method on CORS routes
| * | | | | use client login method on CORS routesChristoph Wurst2016-06-082-11/+12
| |/ / / /
* | | | | Merge pull request #25028 from owncloud/scanner-user-not-setupVincent Petry2016-06-091-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 yetRobin Appelman2016-06-081-1/+6
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-0918-0/+158
| |_|_|/ / |/| | | |
* | | | | Merge pull request #25023 from owncloud/fix-22127-trusted-serversVincent Petry2016-06-083-11/+16
|\ \ \ \ \ | | | | | | | | | | | | Fixed problem about removing trusted servers accidentally
| * | | | | Removed old htmlSergio Bertolín2016-06-081-2/+3
| | | | | |
| * | | | | Improve readabilitySergio Bertolín2016-06-081-1/+1
| | | | | |
| * | | | | Fixed problem about removing trusted servers accidentallySergio Bertolín2016-06-083-9/+13
| | | | | |
* | | | | | Merge pull request #25027 from owncloud/fix-22746-narrowtooltipVincent Petry2016-06-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Added width of the tooltip
| * | | | | | Added width of the tooltipSergio Bertolín2016-06-081-1/+1
| | |/ / / / | |/| | | |
* | | | | | Do not log token or challenge with exception stacktrace (#25026)Joas Schilling2016-06-082-4/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make the filtering better readable * Add some more methods to the sensitive list
* | | | | | Merge pull request #25012 from owncloud/gdrive-fixfilesizewithmimetypemismatchVincent Petry2016-06-081-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix GDrive file size when mime type doesn't match contents
| * | | | | | Fix GDrive file size when mime type doesn't match contentsVincent Petry2016-06-081-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_updateVincent Petry2016-06-081-2/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | .htaccess update making two rules non-capturing
| * | | | | | .htaccess update making two rules non-capturingMartin2016-06-031-2/+2
| | | | | | |
* | | | | | | ownCloud 9.1.0 beta 2v9.1.0beta2v9.0.1beta2Daniel Molkentin2016-06-081-2/+2
| |_|_|/ / / |/| | | | |
* | | | | | Merge pull request #25011 from owncloud/issue-24745-allow-to-cancel-2faVincent Petry2016-06-086-5/+38
|\ \ \ \ \ \ | | | | | | | | | | | | | | Allow to cancel 2FA after login
| * | | | | | Allow to cancel 2FA after loginJoas Schilling2016-06-076-5/+38
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #25019 from owncloud/fix_24937Vincent Petry2016-06-081-0/+18
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bring back sharedstorage hooks
| * | | | | | Bring back sharedstorage hooksRoeland Jago Douma2016-06-081-0/+18
| | | | | | |
* | | | | | | Merge pull request #24899 from owncloud/local-storage-symlinksVincent Petry2016-06-086-3/+73
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | dissalow symlinks in local storages that point outside the datadir
| * | | | | | | Better handling of forbidden files in davRobin Appelman2016-06-072-0/+4
| | | | | | | |
| * | | | | | | Ignore forbidden files while scanningRobin Appelman2016-06-071-1/+6
| | | | | | | |
| * | | | | | | dissalow symlinks in local storages that point outside the datadirRobin Appelman2016-06-073-2/+63
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #24983 from ↵Vincent Petry2016-06-085-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 postgresJoas Schilling2016-06-065-5/+30
| | | | | | | |
* | | | | | | | Merge pull request #24991 from owncloud/2fa-do-not-generate-tokenVincent Petry2016-06-084-19/+61
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | do not generate device token if 2FA is enable for user