summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-04-0512-22/+36
* Merge pull request #15403 from Crote/occ-user-add-returnThomas Müller2015-04-041-1/+2
|\
| * Fix occ user:add failure return codesLaurens Post2015-04-041-1/+2
* | Merge pull request #15338 from owncloud/encryption-mount-optionThomas Müller2015-04-046-16/+60
|\ \
| * | add unit testRobin Appelman2015-04-022-0/+13
| * | adjust unt testsRobin Appelman2015-04-022-2/+4
| * | Add mount point to disable the encryption wrapperRobin Appelman2015-03-315-15/+44
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-0426-56/+112
* | | Merge pull request #15229 from owncloud/response-setContentLengthHeaderThomas Müller2015-04-035-4/+33
|\ \ \
| * | | Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.Andreas Fischer2015-03-265-4/+33
* | | | Merge pull request #15391 from owncloud/fix-language-cachingThomas Müller2015-04-031-2/+3
|\ \ \ \
| * | | | fix caching of preferred languageRobin Appelman2015-04-031-2/+3
* | | | | Merge pull request #15386 from oparoz/yaml-cnf-mediatypeThomas Müller2015-04-034-10/+86
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Introducing media types for yml, yaml, cnf, confOlivier Paroz2015-04-024-10/+86
* | | | | Merge pull request #15383 from owncloud/fix-exception-messageMorris Jobke2015-04-032-2/+2
|\ \ \ \ \
| * | | | | Fix the exception messagesJoas Schilling2015-04-022-2/+2
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-0324-20/+424
| |/ / / / |/| | | |
* | | | | Merge pull request #12314 from oparoz/patch-3Lukas Reschke2015-04-021-11/+18
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Use getenv to get the paths for `find`Olivier Paroz2015-03-311-3/+4
| * | | | use ExecutableFinder and find in findBinaryPathOlivier Paroz2015-03-311-11/+17
| | |_|/ | |/| |
* | | | Merge pull request #14113 from owncloud/chunking-chunkpartfilesThomas Müller2015-04-021-2/+13
|\ \ \ \
| * | | | Added part files for when writing chunksVincent Petry2015-03-161-2/+13
* | | | | Merge pull request #15372 from Volker-E/masterThomas Müller2015-04-021-4/+4
|\ \ \ \ \
| * | | | | fixing #15344 - `title` has no added value here (not on screen readers not fo...Volker E2015-04-011-4/+4
* | | | | | Merge pull request #15367 from owncloud/pre-setup-hookThomas Müller2015-04-023-33/+39
|\ \ \ \ \ \
| * | | | | | setup mount manager before wrappersRobin Appelman2015-04-022-3/+5
| * | | | | | setup storage wrappers before setting up the filesystemRobin Appelman2015-04-012-30/+34
* | | | | | | Merge pull request #15380 from owncloud/issue/15149-fix-initial-listMorris Jobke2015-04-021-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix the initial list of groupsJoas Schilling2015-04-021-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #15346 from oparoz/split-image-providerMorris Jobke2015-04-028-15/+192
|\ \ \ \ \ \ \
| * | | | | | | Split image provider in one sub-class per media typeOlivier Paroz2015-04-028-15/+192
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #15349 from oparoz/limit-bitmap-previews-2Morris Jobke2015-04-021-9/+70
|\ \ \ \ \ \ \
| * | | | | | | The bitmap preview class now takes maxX and maxY into considerationOlivier Paroz2015-04-011-9/+70
| |/ / / / / /
* | | | | | | Merge pull request #15362 from owncloud/issue/15359-purge-memcache-console-ap...Thomas Müller2015-04-026-114/+109
|\ \ \ \ \ \ \
| * | | | | | | Fix docs and line breaksJoas Schilling2015-04-021-1/+5
| * | | | | | | Adjust tests and check whether clear() is calledJoas Schilling2015-04-012-102/+82
| * | | | | | | Correctly purge the cache when an app is disabled via cliJoas Schilling2015-04-014-12/+23
| | |/ / / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-0218-22/+98
* | | | | | | Merge pull request #15364 from rullzer/apps_linkToDocsRoeland Douma2015-04-012-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Use URLGenerator instread of OC_HelperRoeland Jago Douma2015-04-012-2/+2
| |/ / / / /
* | | | | | Merge pull request #15366 from rullzer/deprecate_util_linksRobin McCorkell2015-04-012-0/+8
|\ \ \ \ \ \
| * | | | | | Deprecate functions that only call the urlgenerator anywayRoeland Jago Douma2015-04-012-0/+8
| |/ / / / /
* | | | | | Merge pull request #15358 from owncloud/global-cmdMorris Jobke2015-04-011-2/+2
|\ \ \ \ \ \
| * | | | | | Allow app:check-code and l10n:createjs commands when not installedRobin McCorkell2015-04-011-2/+2
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #15353 from owncloud/run-cron-with-the-correct-user-masterMorris Jobke2015-04-011-0/+16
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Cron has to be executed with the correct user - fixes 13912 and othersThomas Müller2015-04-011-0/+16
* | | | | | Merge pull request #15354 from pierrejochem/patch-1Thomas Müller2015-04-011-1/+3
|\ \ \ \ \ \
| * | | | | | More secure proposalPierre Jochem2015-04-011-1/+3
* | | | | | | Merge pull request #15356 from rullzer/apps_oc_to_ocsRoeland Douma2015-04-017-7/+7
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Move core apps from private to public functionsRoeland Jago Douma2015-04-017-7/+7