summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-24128-601/+388
|
* Merge pull request #11265 from owncloud/fix-11264Morris Jobke2014-09-241-0/+6
|\ | | | | Check for blacklisted characters
| * Check for blacklisted charactersLukas Reschke2014-09-231-0/+6
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11264 (This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-))
* | Merge pull request #11254 from owncloud/fix-filepicker-home-iconVolkan Gezer2014-09-231-0/+2
|\ \ | |/ |/| fix filepicker home icon being partly hidden, fix #10169
| * fix filepicker home icon being partly hidden, fix #10169Jan-Christoph Borchardt2014-09-231-0/+2
| |
* | Merge pull request #11019 from owncloud/do-not-show-exception-to-enduserLukas Reschke2014-09-238-63/+75
|\ \ | | | | | | Do not show exception to the end-user - use a proper error page instead
| * | fix error message templateMorris Jobke2014-09-171-0/+1
| | |
| * | replace horizontal rules with whitespaceJan-Christoph Borchardt2014-09-171-3/+4
| | |
| * | Do not show exception to the end-userLukas Reschke2014-09-178-63/+74
| | | | | | | | | | | | Log the error instead of potentially leaking sensitive information
* | | Merge pull request #7051 from owncloud/postsetupajaxcheckVincent Petry2014-09-239-83/+146
|\ \ \ | |_|/ |/| | Moved WebDAV check to client side JS
| * | Moved WebDAV and internet checks to client side JSVincent Petry2014-09-239-83/+146
| | | | | | | | | | | | | | | | | | | | | - Added setup checks in JavaScript - Moved isWebDAVWorking to JS using SetupChecks - Moved internet connection checks to an ajax call that goes through the server
* | | Merge pull request #11109 from owncloud/nstamm-patch-1Jan-Christoph Borchardt2014-09-231-1/+8
|\ \ \ | | | | | | | | DragnDrop Upload text style
| * | | adjust text size and opacity of drag'n'drop upload text styleJan-Christoph Borchardt2014-09-231-0/+4
| | | |
| * | | DragnDrop Upload text styleNicolas Stamm2014-09-161-1/+4
| | | | | | | | | | | | | | | | The 8px margin was uggly.
* | | | Merge pull request #11222 from owncloud/store-users-timezone-masterThomas Müller2014-09-238-20/+417
|\ \ \ \ | | | | | | | | | | send browsers timezone back tp the server on login
| * | | | enhance formatDate function to accept an optional argument containing the ↵Thomas Müller2014-09-223-9/+45
| | | | | | | | | | | | | | | | | | | | time zone
| * | | | date printed in the admin section regarding last execution time is already ↵Thomas Müller2014-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | displayed in the users timezone - no need to append UTC
| * | | | send browsers timezone back tp the server on loginThomas Müller2014-09-224-10/+371
| | | | |
* | | | | Merge pull request #11234 from owncloud/fix-icon-classesJan-Christoph Borchardt2014-09-238-14/+23
|\ \ \ \ \ | | | | | | | | | | | | Fix icon classes, disappeared delete icon
| * | | | | force show the loading icon in list for deletion, not only on hoverJan-Christoph Borchardt2014-09-221-0/+9
| | | | | |
| * | | | | correct progress-icon to icon-loading-smallJan-Christoph Borchardt2014-09-224-10/+10
| | | | | |
| * | | | | correct delete-icon to icon-delete, fix #11128Jan-Christoph Borchardt2014-09-227-14/+14
| | | | | |
* | | | | | Merge pull request #11137 from owncloud/enc-pregfixVincent Petry2014-09-2310-113/+384
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix share key pattern matching
| * | | | | | Fix share key finding algorithm in various casesVincent Petry2014-09-2310-113/+384
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of inaccurate pattern matching, use the list of users who we know have access to the file to build the list of share keys. This covers the following cases: - Move/copy files into a subfolder within a share - Unsharing from a user - Deleting files directlry / moving share keys to trashbin
* | | | | | Merge pull request #11241 from owncloud/use-lower-caseThomas Müller2014-09-232-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use only lower-case letters
| * | | | | | Use only lower-case lettersLukas Reschke2014-09-222-2/+5
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11239
* | | | | | Merge pull request #11032 from owncloud/harden-redirectLukas Reschke2014-09-238-96/+302
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Do only follow HTTP and HTTPS redirects
| * | | | | Do only follow HTTP and HTTPS redirectsLukas Reschke2014-09-228-96/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server) Get final redirect manually using get_headers() Migrate to HTTPHelper class and add unit tests
* | | | | | Merge pull request #11226 from owncloud/kill-postsetupcheck-masterVincent Petry2014-09-233-30/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | remove post setup check
| * | | | | | remove post setup checkThomas Müller2014-09-223-30/+4
| | | | | | |
* | | | | | | Merge pull request #11224 from owncloud/fix_recovery_admin_userLukas Reschke2014-09-231-5/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | first check if a private key exists, if not it is always a recovery szenario
| * | | | | | | first check if a private key exists, if not it is always a recovery szenarioBjoern Schiessle2014-09-221-5/+4
| |/ / / / / /
* | | | | | | Merge pull request #11242 from owncloud/fix-10284Lukas Reschke2014-09-231-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use non-empty defaults for preview cmd line
| * | | | | | | Use non-empty defaultsVictor Dubiniuk2014-09-221-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2321-17/+45
| | | | | | |
* | | | | | | Merge pull request #11227 from owncloud/fix-windows-pathThomas Müller2014-09-235-9/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | fixing directory seperators
| * | | | | | | ignoring writedata test in windows.Clark Tomlinson2014-09-221-0/+3
| | | | | | | |
| * | | | | | | fixing cache routesClark Tomlinson2014-09-223-7/+7
| | | | | | | |
| * | | | | | | fixing directory seperatorsClark Tomlinson2014-09-221-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #11221 from owncloud/fix-autotestThomas Müller2014-09-231-14/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix autotest.sh for whitespace in paths
| * | | | | | | Fix autotest.sh for whitespace in pathsRobin McCorkell2014-09-221-14/+14
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge pull request #11215 from owncloud/dav-throwwhendeletefailedMorris Jobke2014-09-234-7/+131
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | WebDAV now throws 403 when deletion did not work
| * | | | | | | WebDAV now throws 403 when deletion did not workVincent Petry2014-09-224-7/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assume a permission issue whenever a file could not be deleted. This is because some storages are not able to return permissions, so a permission denied situation can only be triggered during direct deletion.
* | | | | | | | Merge pull request #11211 from owncloud/previewProviderSwitchMorris Jobke2014-09-237-84/+63
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Add a configuration switch for enabled preview mimetypes
| * | | | | | | Remove unneeded unit testsLukas Reschke2014-09-223-23/+0
| | | | | | | |
| * | | | | | | Add a configuration switch for enabled preview mimetypesLukas Reschke2014-09-224-61/+63
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #11228 from owncloud/drop-travisMorris Jobke2014-09-224-274/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Revert "Travis support"
| * | | | | | | Revert "Travis support"Morris Jobke2014-09-224-274/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 472d896ce9aad4d526126a7aefa96127920585e6. Conflicts: .travis.yml
* | | | | | | | Merge pull request #11186 from owncloud/trash-fixdoubledeleteraceconditionVincent Petry2014-09-221-0/+26
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Added extra check to avoid deleting key folders
| * | | | | | | Added extra check to avoid deleting key foldersVincent Petry2014-09-191-0/+26
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a delete operation is called twice in a row, it could happen that the first call already deleted the file. The second call would return an empty $ownerPath because the file does not exist. That empty $ownerPath would run the key deletion operation on the wrong path. This fix adds checks in many places to make sure we don't use $ownerPath when it's empty or null.