Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix dav permissions for folders without create permissions | Robin Appelman | 2014-09-25 | 1 | -1/+1 |
| | |||||
* | Expose creatable permissions trough fileinfo | Robin Appelman | 2014-09-25 | 2 | -0/+16 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-25 | 5 | -8/+29 |
| | |||||
* | Clarify possible preview providers for type Office | Lukas Reschke | 2014-09-24 | 1 | -2/+6 |
| | | | | a | ||||
* | Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSON | Thomas Müller | 2014-09-24 | 1 | -1/+3 |
|\ | | | | | Show login again instead of JSON if CSRF check fails | ||||
| * | Show login again instead of JSON if CSRF check fails | Lukas Reschke | 2014-09-23 | 1 | -1/+3 |
| | | | | | | | | | | | | | | | | Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login. With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often. This can be tested by opening the login page, then clearing the cookies, and trying to login. | ||||
* | | Merge pull request #11229 from kofemann/for-upstream | Lukas Reschke | 2014-09-24 | 1 | -9/+8 |
|\ \ | | | | | | | user/backed: use pow of two for backed action constants | ||||
| * | | user/backed: use pow of two for backed action constants | Tigran Mkrtchyan | 2014-09-23 | 1 | -9/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | the current implementation limits number of possible backed actions to 8 as it uses pow of 16 for constants. This change introduces pow of two and allows up-to 32 actions to be defined. The old values are preserved for backward compatibility. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-24 | 52 | -101/+10 |
| | | | |||||
* | | | Merge pull request #11019 from owncloud/do-not-show-exception-to-enduser | Lukas Reschke | 2014-09-23 | 5 | -62/+40 |
|\ \ \ | | | | | | | | | Do not show exception to the end-user - use a proper error page instead | ||||
| * | | | fix error message template | Morris Jobke | 2014-09-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | Do not show exception to the end-user | Lukas Reschke | 2014-09-17 | 5 | -62/+40 |
| | | | | | | | | | | | | | | | | Log the error instead of potentially leaking sensitive information | ||||
* | | | | Merge pull request #7051 from owncloud/postsetupajaxcheck | Vincent Petry | 2014-09-23 | 1 | -47/+0 |
|\ \ \ \ | |_|_|/ |/| | | | Moved WebDAV check to client side JS | ||||
| * | | | Moved WebDAV and internet checks to client side JS | Vincent Petry | 2014-09-23 | 1 | -47/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 #11222 from owncloud/store-users-timezone-master | Thomas Müller | 2014-09-23 | 3 | -17/+29 |
|\ \ \ \ | | | | | | | | | | | send browsers timezone back tp the server on login | ||||
| * | | | | enhance formatDate function to accept an optional argument containing the ↵ | Thomas Müller | 2014-09-22 | 2 | -9/+21 |
| | | | | | | | | | | | | | | | | | | | | time zone | ||||
| * | | | | send browsers timezone back tp the server on login | Thomas Müller | 2014-09-22 | 1 | -8/+8 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #11241 from owncloud/use-lower-case | Thomas Müller | 2014-09-23 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Use only lower-case letters | ||||
| * | | | | Use only lower-case letters | Lukas Reschke | 2014-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11239 | ||||
* | | | | | Merge pull request #11032 from owncloud/harden-redirect | Lukas Reschke | 2014-09-23 | 6 | -94/+207 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Do only follow HTTP and HTTPS redirects | ||||
| * | | | | Do only follow HTTP and HTTPS redirects | Lukas Reschke | 2014-09-22 | 6 | -94/+207 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-master | Vincent Petry | 2014-09-23 | 1 | -21/+1 |
|\ \ \ \ | | | | | | | | | | | remove post setup check | ||||
| * | | | | remove post setup check | Thomas Müller | 2014-09-22 | 1 | -21/+1 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-23 | 2 | -0/+3 |
| | | | | | |||||
* | | | | | Merge pull request #11227 from owncloud/fix-windows-path | Thomas Müller | 2014-09-23 | 1 | -2/+2 |
|\ \ \ \ \ | | | | | | | | | | | | | fixing directory seperators | ||||
| * | | | | | fixing directory seperators | Clark Tomlinson | 2014-09-22 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #11215 from owncloud/dav-throwwhendeletefailed | Morris Jobke | 2014-09-23 | 2 | -2/+9 |
|\ \ \ \ \ | | | | | | | | | | | | | WebDAV now throws 403 when deletion did not work | ||||
| * | | | | | WebDAV now throws 403 when deletion did not work | Vincent Petry | 2014-09-22 | 2 | -2/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/previewProviderSwitch | Morris Jobke | 2014-09-23 | 3 | -61/+40 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | Add a configuration switch for enabled preview mimetypes | ||||
| * | | | | | Add a configuration switch for enabled preview mimetypes | Lukas Reschke | 2014-09-22 | 3 | -61/+40 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #11204 from owncloud/fix_oc_stream_seek | Morris Jobke | 2014-09-22 | 3 | -3/+3 |
|\ \ \ \ \ | |/ / / / |/| | | | | Fix oc stream seek | ||||
| * | | | | in quota wrapper use === instead of ! for better readability and as in other ↵ | Jörn Friedrich Dreyer | 2014-09-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | wrappers | ||||
| * | | | | return boolean in Ciose::stream_seek | Jörn Friedrich Dreyer | 2014-09-22 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | return boolean in OC::stream_seek | Jörn Friedrich Dreyer | 2014-09-22 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge pull request #11210 from owncloud/issue/11209 | Morris Jobke | 2014-09-22 | 1 | -1/+20 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Also match routes without trailing slash for files app | ||||
| * | | | | Also match routes without trailing slash | Joas Schilling | 2014-09-22 | 1 | -1/+20 |
| | | | | | | | | | | | | | | | | | | | | Fix #11209 | ||||
* | | | | | Merge pull request #9225 from voxsim/fix_displayNamesInGroup | blizzz | 2014-09-22 | 1 | -11/+29 |
|\ \ \ \ \ | | | | | | | | | | | | | fix in displayNamesInGroup | ||||
| * | | | | | 1. remove sizeof($filteredUsers) > 0 as condition | voxsim | 2014-09-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability. 3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser; | ||||
| * | | | | | add more logic in displayNamesInGroup for big user bases | voxsim | 2014-09-15 | 1 | -5/+16 |
| | | | | | | |||||
| * | | | | | change logic in displayNamesInGroup and add some unit tests | voxsim | 2014-08-28 | 1 | -10/+17 |
| | | | | | | |||||
| * | | | | | fix in displayNamesInGroup: when specified limit N, we did complex search ↵ | voxsim | 2014-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | only in the first N users | ||||
* | | | | | | Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard | Thomas Müller | 2014-09-22 | 1 | -2/+10 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Append port to trusted domain in case it's not 80 or 443 | ||||
| * | | | | | | Append port to trusted domain in case it's not 80 or 443 | Lukas Reschke | 2014-09-08 | 1 | -2/+10 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | Ref https://github.com/owncloud/core/pull/10584#issuecomment-54677059 | ||||
* | | | | | | Merge pull request #10499 from owncloud/mkcol-headers-afterbind | Thomas Müller | 2014-09-22 | 1 | -1/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Use afterBind to send fileId header for files and directories | ||||
| * | | | | | | Use afterBind to send fileId header for files and directories | Vincent Petry | 2014-08-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afterBind is called for both files and directories and is now used to send the OC-FileId headers. | ||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-22 | 1 | -1/+6 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #11199 from owncloud/delete_bogus_previews | Morris Jobke | 2014-09-21 | 2 | -1/+43 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | Delete bogus cached previews while updating | ||||
| * | | | | | | delete old previews | Georg Ehrke | 2014-09-21 | 2 | -1/+43 |
| | | | | | | | |||||
* | | | | | | | make sure preview prop is instanceof OC_Image before using it in showPreview | Georg Ehrke | 2014-09-21 | 1 | -1/+3 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #11196 from owncloud/sqlite-migration-smallint-master | Morris Jobke | 2014-09-21 | 1 | -0/+1 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | adding 'smallint unsigned' to type mapping for sqlite |