summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* updating 3rdparty submoduleThomas Müller2014-03-171-0/+0
|
* Merge pull request #7649 from owncloud/routing-publicThomas Müller2014-03-1714-66/+269
|\ | | | | Move routing classes to an interface and expose it in the public api
| * update copyright headerRobin Appelman2014-03-101-1/+1
| |
| * switch OC::getRouter usages to OC::$server->getRouterRobin Appelman2014-03-104-13/+5
| |
| * Move the router classes to a namespace and expose it with a public interfaceRobin Appelman2014-03-1011-55/+266
| |
* | Merge pull request #7764 from owncloud/datadir-chmodicewind19912014-03-172-30/+1
|\ \ | | | | | | use a non-recursive chmod on the datadir
| * | use a non-recursive chmod on the datadirRobin Appelman2014-03-172-30/+1
| | |
* | | Merge pull request #7760 from owncloud/core-roundbytesicewind19912014-03-172-3/+5
|\ \ \ | | | | | | | | Correctly round bytes when converted from human readable format
| * | | Correctly round bytes when converted from human readable formatVincent Petry2014-03-172-3/+5
| |/ / | | | | | | | | | | | | Instead of leave two decimal places which is confusing, round the byte values correctly to the closest byte.
* | | Merge pull request #7761 from owncloud/improve_documentationVincent Petry2014-03-171-1/+1
|\ \ \ | | | | | | | | clarify the use-case of the encryption app.
| * | | clearify the use-case of this appFrank Karlitschek2014-03-171-1/+1
| |/ /
* | | Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarningicewind19912014-03-172-1/+27
|\ \ \ | | | | | | | | Added warning for trusted_domains after CLI upgrade
| * | | Added warning for trusted_domains after CLI upgradeVincent Petry2014-03-142-1/+27
| | | | | | | | | | | | | | | | | | | | If trusted_domains is not set after a CLI upgrade, show a warning in the output.
* | | | Merge pull request #7704 from ↵Vincent Petry2014-03-172-12/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/preview_use_pre_instead_of_post_delete_hook_2 use preDelete instead of postDelete hook
| * | | | improve validation of getFileInfo in \OC\PreviewGeorg Ehrke2014-03-131-8/+20
| | | | |
| * | | | use preDelete instead of postDelete hookGeorg Ehrke2014-03-132-4/+38
| | | | |
* | | | | Merge pull request #7728 from owncloud/oc_image_show_save_custom_mimeVincent Petry2014-03-173-56/+122
|\ \ \ \ \ | |_|_|/ / |/| | | | make it possible to influence output type of \OC_Image
| * | | | unit tests for specific image type output addedThomas Müller2014-03-172-3/+28
| | | | |
| * | | | fixing PHPDocThomas Müller2014-03-171-49/+58
| | | | |
| * | | | OC_Image::_output() - throw exception instead of falling back to pngGeorg Ehrke2014-03-141-1/+1
| | | | |
| * | | | remove image/pjpeg from OC_Image::_outputGeorg Ehrke2014-03-141-1/+0
| | | | |
| * | | | don't change mimetype of whole image objectGeorg Ehrke2014-03-141-6/+6
| | | | |
| * | | | always output a pngGeorg Ehrke2014-03-141-1/+1
| | | | |
| * | | | make it possible to influence output type of \OC_ImageGeorg Ehrke2014-03-141-7/+40
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1716-107/+132
| | | | |
* | | | | Merge pull request #7734 from owncloud/icon-class-removeMorris Jobke2014-03-163-6/+6
|\ \ \ \ \ | | | | | | | | | | | | remove unneeded icon class
| * | | | | remove unneeded icon classJan-Christoph Borchardt2014-03-143-6/+6
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1631-195/+263
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1599-558/+683
|/ / / / /
* | | | | Merge pull request #7725 from owncloud/body-publicRaghu Nayyar2014-03-141-1/+1
|\ \ \ \ \ | | | | | | | | | | | | add 'body-public' ID to body in base layout so it can be identified via CSS
| * | | | | add 'body-public' ID to body in base layout so it can be identified via CSSJan-Christoph Borchardt2014-03-141-1/+1
|/ / / / /
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1412-12/+12
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1323-3470/+12
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1372-408/+4760
|/ / / /
* | | | Merge pull request #7686 from owncloud/ocs_fix_pathsBjörn Schießle2014-03-133-7/+132
|\ \ \ \ | | | | | | | | | | finally fix the paths for the OCS Share API
| * | | | finally fix the paths for the OCS Share APIBjoern Schiessle2014-03-133-7/+132
| | | | |
* | | | | Merge pull request #7718 from owncloud/fixing-7345-masterThomas Müller2014-03-131-0/+1
|\ \ \ \ \ | | | | | | | | | | | | map transifex language ja_JP to ja
| * | | | | map transifex language ja_JP to jaThomas Müller2014-03-131-0/+1
|/ / / / /
* | | | | Merge pull request #7340 from owncloud/hide_remove_image_avatarMorris Jobke2014-03-131-0/+15
|\ \ \ \ \ | | | | | | | | | | | | Hide remove image, if there's no custom avatar
| * | | | | Use $.hide() instead of .hidden for nowkondou2014-03-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | .inlineblock ranks higher than .hidden
| * | | | | Remove OC.Router usagekondou2014-03-121-7/+8
| | | | | |
| * | | | | Merge branch 'master' into hide_remove_image_avatarkondou2014-03-121539-49359/+80800
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into hide_remove_image_avatarkondou2014-02-2897-709/+1736
| |\ \ \ \ \ \
| * | | | | | | Use addClass('hidden') and removeClass('hidden')kondou2014-02-211-3/+3
| | | | | | | |
| * | | | | | | Hide remove image, if there's no custom avatarkondou2014-02-201-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #7308
* | | | | | | | Merge pull request #7671 from fpiraneo/patch-1Vincent Petry2014-03-131-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Update index.php
| * | | | | | | Update index.phpFrancesco Piraneo G.2014-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files;
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-1354-814/+898
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-masterLukas Reschke2014-03-121-1/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | remove Sabre_DAV_Browser_Plugin
| * | | | | | | remove Sabre_DAV_Browser_PluginThomas Müller2014-03-121-1/+0
| | | | | | | |