summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use non-empty defaultsVictor Dubiniuk2014-09-221-1/+1
|
* 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.
* | | Merge pull request #11167 from owncloud/env-movetomountreenableproxyMorris Jobke2014-09-221-0/+1
|\ \ \ | |_|/ |/| | Reenable file proxy when renaming between mount points
| * | Reenable file proxy when renaming between mount pointsVincent Petry2014-09-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | When moving a folder into another mount point, $renamedFiles is empty because that goes over a different mechanism. In such case, this fix makes sure that the file proxy is reenable to avoid breaking the subsequent files that are being moved.
* | | Merge pull request #11204 from owncloud/fix_oc_stream_seekMorris Jobke2014-09-224-3/+13
|\ \ \ | | | | | | | | 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
| | | |
| * | | add seek and tell to streamwrapper testJörn Friedrich Dreyer2014-09-211-0/+10
| | | |
* | | | Merge pull request #11212 from owncloud/occ-catching-errorsMorris Jobke2014-09-222-23/+30
|\ \ \ \ | | | | | | | | | | Occ catching errors
| * | | | no loner use deprecated class \OC_ConfigThomas Müller2014-09-222-3/+16
| | | | |
| * | | | remove bootstrapping - occ can by definition only be executed if ownCloud is ↵Thomas Müller2014-09-221-8/+0
| | | | | | | | | | | | | | | | | | | | installed - base.php is required earlier already
| * | | | show upgrade errors as error in the console and report back that the upgrade ↵Thomas Müller2014-09-221-12/+14
| | | | | | | | | | | | | | | | | | | | process failed if it did
* | | | | 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
* | | | | | update 3rdparty submodule to its master commitMorris Jobke2014-09-221-0/+0
| | | | | |
* | | | | | Merge pull request #9225 from voxsim/fix_displayNamesInGroupblizzz2014-09-222-22/+328
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | 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-152-16/+49
| | | | | |
| * | | | | change logic in displayNamesInGroup and add some unit testsvoxsim2014-08-282-21/+294
| | | | | |
| * | | | | 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.
* | | | | | | | fix button text l10nVolkan Gezer2014-09-221-1/+1
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2213-13/+18
| | | | | | | |
* | | | | | | | Merge pull request #11203 from owncloud/fix_broken_previews_on_public_pageMorris Jobke2014-09-211-0/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | files_sharing: add route for ajax/publicpreview
| * | | | | | | | files_sharing: add route for ajax/publicpreviewGeorg Ehrke2014-09-211-0/+2
| | | | | | | | |
* | | | | | | | | 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
| |/ / / / / / /
* | | | | | | | Merge pull request #11200 from owncloud/preview_better_errorhandlingMorris Jobke2014-09-211-1/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | make sure preview prop is instanceof OC_Image before using it in showPreview
| * | | | | | | 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
| * | | | | | | adding 'smallint unsigned' to type mapping for sqliteThomas Müller2014-09-201-0/+1
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2124-41/+83
|/ / / / / / /
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-09-2031-97/+164
| | | | | | |
* | | | | | | Merge pull request #11178 from ↵Morris Jobke2014-09-191-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/throw-error-on-preview-instead-in-the-contructor Throw error in showPreview instead the constructor
| * | | | | | | Throw error in showPreview instead the constructorLukas Reschke2014-09-191-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This function is also used in a way such as: ``` $preview = new \OC\Preview(\OC_User::getUser(), 'files'); $info = \OC\Files\Filesystem::getFileInfo($file); if (!$always and !$preview->isAvailable($info)) { \OC_Response::setStatus(404); } else { $preview->setFile($file); $preview->setMaxX($maxX); $preview->setMaxY($maxY); $preview->setScalingUp($scalingUp); $preview->setKeepAspect($keepAspect); } ``` Which won't work anymore since `setFile` is used instead of passing the file in the constructor. Fixes a regression in master.
* | | | | | | | Merge pull request #11184 from owncloud/typoMorris Jobke2014-09-191-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | fix typo. closes #11132
| * | | | | | | fix typoVolkan Gezer2014-09-191-1/+1
|/ / / / / / /
* | | | | | | Add myself as authorVincent Petry2014-09-191-0/+1
| | | | | | |
* | | | | | | Merge pull request #10968 from owncloud/admin-groupsselect2Lukas Reschke2014-09-1968-113/+153
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use select2 for the groups excluded from sharing in admin page
| * | | | | | | Add select2 cache for complete group listVincent Petry2014-09-111-23/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid making a server request every time the dropdown opens, the whole list of groups are cached (from the last request): Whenever the user types in a search term it will still send server requests.
| * | | | | | | fit select2 to ownCloud input styleJan-Christoph Borchardt2014-09-101-0/+12
| | | | | | | |
| * | | | | | | Fixed select2 for admin and apps pageVincent Petry2014-09-104-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added explicit escaping. Now internally using a pipe symbol as separator for select2, to make it possible to use group names containing commas.
| * | | | | | | Added select2 on the apps pageVincent Petry2014-09-096-88/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved setupGroupsSelect() from admin.js to a common settings.js as OC.Settings.setupGoupsSelect(). Now using select2 as well on the apps page.
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-11 11:57:29 +0000