summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #15391 from owncloud/fix-language-cachingThomas Müller2015-04-031-2/+3
|\ | | | | fix caching of preferred language
| * 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, conf
| * 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
|\ \ | | | | | | Update exception messages to better reflect and describe the problem
| * | 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
|\ \ | |/ |/| Make findBinaryPath compatible with open_basedir
| * 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
| | | | | | | | | | | | | | | | | | | | | | When using open_basedir, commands such as `which`or `command`can fail because they might try to look outside of the restricted perimeter. Symfony's ExecutableFinder can be used instead to look in standard locations and we can use `find` as a last resort A better solution would be to adopt a mechanism similar to what has been done for office documents where a configuration parameter is used to indicate the path where the executable is to be found.
* | Merge pull request #14113 from owncloud/chunking-chunkpartfilesThomas Müller2015-04-021-2/+13
|\ \ | | | | | | Added part files for when writing chunks
| * | Added part files for when writing chunksVincent Petry2015-03-161-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a chunk is being written, it is now written to a part file first. This is to avoid a concurrent chunk upload to believe that the former chunk already exists, even though it's not fully written. This makes sure that the final file assembly is only done when all chunks were successfully written. Also added an extra unique id to chunk parts in case the same chunk is uploaded twice concurrently.
* | | Merge pull request #15372 from Volker-E/masterThomas Müller2015-04-021-4/+4
|\ \ \ | | | | | | | | fixing #15344
| * | | fixing #15344 - `title` has no added value here (not on screen readers not ↵Volker E2015-04-011-4/+4
| | | | | | | | | | | | | | | | for robots)
* | | | Merge pull request #15367 from owncloud/pre-setup-hookThomas Müller2015-04-023-33/+39
|\ \ \ \ | | | | | | | | | | setup storage wrappers before setting up the filesystem
| * | | | 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 groups
| * | | | | 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 type
| * | | | | 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 consideration
| * | | | | The bitmap preview class now takes maxX and maxY into considerationOlivier Paroz2015-04-011-9/+70
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | This is a fix for owncloud#13607 and is part of the global programme: owncloud#13609 The image aspect ratio is kept intact.
* | | | | Merge pull request #15362 from ↵Thomas Müller2015-04-026-114/+109
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue/15359-purge-memcache-console-app-disable Correctly purge the cache when an app is disabled via cli
| * | | | | 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 instead of OC_Helper for linkToDocs
| * | | | 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 (OC_Helper + OCP\Util) that only call the urlgenerator anyway
| * | | | 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 installed
| * | | | 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
| * | | | 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 proposal
| * | | | | 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 functions (trivial part)
| * | | | | Move core apps from private to public functionsRoeland Jago Douma2015-04-017-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apps still use OC_Helper and OC_Util functions even when public ones are already available. Sometimes the public one is even used in the same file.
* | | | | | Merge pull request #15336 from owncloud/revive-15215Morris Jobke2015-04-012-18/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | Properly quote file names in listFiles query for GDrive
| * | | | | | Only escape single quotesLukas Reschke2015-03-311-2/+2
| | | | | | |
| * | | | | | Added rawurlencode for other params in GDrive storageVincent Petry2015-03-311-2/+2
| | | | | | |
| * | | | | | Properly quote file names in listFiles query for GDriveVincent Petry2015-03-312-17/+19
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #15351 from owncloud/add-title-to-app-entriesLukas Reschke2015-04-011-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | add title to entries in app menu
| * | | | | | add title to entries in app menuMorris Jobke2015-04-011-2/+2
|/ / / / / /
* | | | | | Merge pull request #15331 from owncloud/fix-passwordMorris Jobke2015-04-011-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Fix JS reference error for personal password changing
| * | | | | Fix JS reference error for personal password changingRobin McCorkell2015-03-311-1/+1
| | |_|/ / | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-04-01142-6/+272
| |/ / / |/| | |
* | | | Merge pull request #15335 from owncloud/revert-15215-ext-gdrivelistfilequotingLukas Reschke2015-03-312-20/+18
|\ \ \ \ | | | | | | | | | | Revert "Properly quote file names in listFiles query for GDrive"
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-16 01:48:36 +0000