summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #11226 from owncloud/kill-postsetupcheck-masterVincent Petry2014-09-233-30/+4
|\ \ \ \ \ \ \
| * | | | | | | 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 szenarioBjoern Schiessle2014-09-221-5/+4
| |/ / / / / / /
* | | | | | | | Merge pull request #11242 from owncloud/fix-10284Lukas Reschke2014-09-231-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | 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
|\ \ \ \ \ \ \ \
| * | | | | | | | 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 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 workVincent Petry2014-09-224-7/+131
* | | | | | | | | Merge pull request #11211 from owncloud/previewProviderSwitchMorris Jobke2014-09-237-84/+63
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | 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"Morris Jobke2014-09-224-274/+0
* | | | | | | | | Merge pull request #11186 from owncloud/trash-fixdoubledeleteraceconditionVincent Petry2014-09-221-0/+26
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Added extra check to avoid deleting key foldersVincent Petry2014-09-191-0/+26
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #11167 from owncloud/env-movetomountreenableproxyMorris Jobke2014-09-221-0/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Reenable file proxy when renaming between mount pointsVincent Petry2014-09-181-0/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge pull request #11204 from owncloud/fix_oc_stream_seekMorris Jobke2014-09-224-3/+13
|\ \ \ \ \ \ \
| * | | | | | | in quota wrapper use === instead of ! for better readability and as in other ...Jörn Friedrich Dreyer2014-09-221-1/+1
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | 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
| * | | | | | | show upgrade errors as error in the console and report back that the upgrade ...Thomas Müller2014-09-221-12/+14
* | | | | | | | Merge pull request #11210 from owncloud/issue/11209Morris Jobke2014-09-221-1/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Also match routes without trailing slashJoas Schilling2014-09-221-1/+20
* | | | | | | | | update 3rdparty submodule to its master commitMorris Jobke2014-09-221-0/+0
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge pull request #9225 from voxsim/fix_displayNamesInGroupblizzz2014-09-222-22/+328
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | 1. remove sizeof($filteredUsers) > 0 as conditionvoxsim2014-09-181-2/+2
| * | | | | | | 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 onl...voxsim2014-06-261-1/+1
* | | | | | | | 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 443Lukas Reschke2014-09-081-2/+10
* | | | | | | | | Merge pull request #10499 from owncloud/mkcol-headers-afterbindThomas Müller2014-09-221-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use afterBind to send fileId header for files and directoriesVincent Petry2014-08-181-1/+1
* | | | | | | | | | 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/publicpreviewGeorg Ehrke2014-09-211-0/+2
* | | | | | | | | | | Merge pull request #11199 from owncloud/delete_bogus_previewsMorris Jobke2014-09-212-1/+43
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-01 17:07:45 +0000