summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Fix dav permissions for folders without create permissionsRobin Appelman2014-09-251-1/+1
|
* Expose creatable permissions trough fileinfoRobin Appelman2014-09-252-0/+16
|
* [tx-robot] updated from transifexJenkins for ownCloud2014-09-255-8/+29
|
* Clarify possible preview providers for type OfficeLukas Reschke2014-09-241-2/+6
| | | | a
* Merge pull request #11225 from owncloud/showLoginAgainInsteadOfJSONThomas Müller2014-09-241-1/+3
|\ | | | | Show login again instead of JSON if CSRF check fails
| * Show login again instead of JSON if CSRF check failsLukas Reschke2014-09-231-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-upstreamLukas Reschke2014-09-241-9/+8
|\ \ | | | | | | user/backed: use pow of two for backed action constants
| * | user/backed: use pow of two for backed action constantsTigran Mkrtchyan2014-09-231-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 transifexJenkins for ownCloud2014-09-2452-101/+10
| | |
* | | Merge pull request #11019 from owncloud/do-not-show-exception-to-enduserLukas Reschke2014-09-235-62/+40
|\ \ \ | | | | | | | | Do not show exception to the end-user - use a proper error page instead
| * | | fix error message templateMorris Jobke2014-09-171-0/+1
| | | |
| * | | Do not show exception to the end-userLukas Reschke2014-09-175-62/+40
| | | | | | | | | | | | | | | | Log the error instead of potentially leaking sensitive information
* | | | Merge pull request #7051 from owncloud/postsetupajaxcheckVincent Petry2014-09-231-47/+0
|\ \ \ \ | |_|_|/ |/| | | Moved WebDAV check to client side JS
| * | | Moved WebDAV and internet checks to client side JSVincent Petry2014-09-231-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-masterThomas Müller2014-09-233-17/+29
|\ \ \ \ | | | | | | | | | | send browsers timezone back tp the server on login
| * | | | enhance formatDate function to accept an optional argument containing the ↵Thomas Müller2014-09-222-9/+21
| | | | | | | | | | | | | | | | | | | | time zone
| * | | | send browsers timezone back tp the server on loginThomas Müller2014-09-221-8/+8
| | |_|/ | |/| |
* | | | Merge pull request #11241 from owncloud/use-lower-caseThomas Müller2014-09-231-1/+1
|\ \ \ \ | | | | | | | | | | Use only lower-case letters
| * | | | Use only lower-case lettersLukas Reschke2014-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11239
* | | | | Merge pull request #11032 from owncloud/harden-redirectLukas Reschke2014-09-236-94/+207
|\ \ \ \ \ | |_|_|/ / |/| | | | Do only follow HTTP and HTTPS redirects
| * | | | Do only follow HTTP and HTTPS redirectsLukas Reschke2014-09-226-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-masterVincent Petry2014-09-231-21/+1
|\ \ \ \ | | | | | | | | | | remove post setup check
| * | | | remove post setup checkThomas Müller2014-09-221-21/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-232-0/+3
| | | | |
* | | | | Merge pull request #11227 from owncloud/fix-windows-pathThomas Müller2014-09-231-2/+2
|\ \ \ \ \ | | | | | | | | | | | | fixing directory seperators
| * | | | | fixing directory seperatorsClark Tomlinson2014-09-221-2/+2
| |/ / / /
* | | | | Merge pull request #11215 from owncloud/dav-throwwhendeletefailedMorris Jobke2014-09-232-2/+9
|\ \ \ \ \ | | | | | | | | | | | | WebDAV now throws 403 when deletion did not work
| * | | | | WebDAV now throws 403 when deletion did not workVincent Petry2014-09-222-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/previewProviderSwitchMorris Jobke2014-09-233-61/+40
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | Add a configuration switch for enabled preview mimetypes
| * | | | | Add a configuration switch for enabled preview mimetypesLukas Reschke2014-09-223-61/+40
| | |/ / / | |/| | |
* | | | | Merge pull request #11204 from owncloud/fix_oc_stream_seekMorris Jobke2014-09-223-3/+3
|\ \ \ \ \ | |/ / / / |/| | | | Fix oc stream seek
| * | | | in quota wrapper use === instead of ! for better readability and as in other ↵Jörn Friedrich Dreyer2014-09-221-1/+1
| | | | | | | | | | | | | | | | | | | | wrappers
| * | | | return boolean in Ciose::stream_seekJörn Friedrich Dreyer2014-09-221-1/+1
| | | | |
| * | | | return boolean in OC::stream_seekJörn Friedrich Dreyer2014-09-221-1/+1
| | | | |
* | | | | Merge pull request #11210 from owncloud/issue/11209Morris Jobke2014-09-221-1/+20
|\ \ \ \ \ | |_|_|/ / |/| | | | Also match routes without trailing slash for files app
| * | | | Also match routes without trailing slashJoas Schilling2014-09-221-1/+20
| | | | | | | | | | | | | | | | | | | | Fix #11209
* | | | | Merge pull request #9225 from voxsim/fix_displayNamesInGroupblizzz2014-09-221-11/+29
|\ \ \ \ \ | | | | | | | | | | | | fix in displayNamesInGroup
| * | | | | 1. remove sizeof($filteredUsers) > 0 as conditionvoxsim2014-09-181-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 basesvoxsim2014-09-151-5/+16
| | | | | |
| * | | | | change logic in displayNamesInGroup and add some unit testsvoxsim2014-08-281-10/+17
| | | | | |
| * | | | | fix in displayNamesInGroup: when specified limit N, we did complex search ↵voxsim2014-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | only in the first N users
* | | | | | Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizardThomas Müller2014-09-221-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 443Lukas Reschke2014-09-081-2/+10
| | |/ / / / | |/| | | | | | | | | | | | | | | | Ref https://github.com/owncloud/core/pull/10584#issuecomment-54677059
* | | | | | Merge pull request #10499 from owncloud/mkcol-headers-afterbindThomas Müller2014-09-221-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use afterBind to send fileId header for files and directories
| * | | | | | Use afterBind to send fileId header for files and directoriesVincent Petry2014-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afterBind is called for both files and directories and is now used to send the OC-FileId headers.
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-221-1/+6
| | | | | | |
* | | | | | | Merge pull request #11199 from owncloud/delete_bogus_previewsMorris Jobke2014-09-212-1/+43
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Delete bogus cached previews while updating
| * | | | | | delete old previewsGeorg Ehrke2014-09-212-1/+43
| | | | | | |
* | | | | | | make sure preview prop is instanceof OC_Image before using it in showPreviewGeorg Ehrke2014-09-211-1/+3
|/ / / / / /
* | | | | | Merge pull request #11196 from owncloud/sqlite-migration-smallint-masterMorris Jobke2014-09-211-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | adding 'smallint unsigned' to type mapping for sqlite