summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed chunking and insufficient storage checkVincent Petry2014-03-172-3/+48
| | | | | | | - fixed free space detection based on the already uploaded chunks - now deleting chunks as soon as it is read out before writing it into the part file, which reduces the space needed when assembling part files
* 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
| | | | | |
* | | | | | Merge pull request #6632 from eduardosan/masterVincent Petry2014-03-121-3/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix PostgreSQL port configuration on install
| * | | | | | Remove unused spaceseduardo2014-01-081-2/+2
| | | | | | |
| * | | | | | Remove name from codeeduardo2014-01-081-2/+0
| | | | | | |
| * | | | | | Add tabs to conformance with owncloud code standardseduardo2014-01-051-4/+4
| | | | | | |
| * | | | | | Fix PostgreSQL port configuration on installeduardo2014-01-041-3/+19
| | | | | | |
* | | | | | | Merge pull request #7564 from owncloud/issue/7559Vincent Petry2014-03-122-3/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Hide QMail when not selected and hide SendMail when not available on the server
| * | | | | | | Use command -v to check for sendmailJoas Schilling2014-03-121-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #7559
| * | | | | | | Hide QMail when not selected and hide sendmail when not available on the serverJoas Schilling2014-03-052-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix #7559
* | | | | | | | Merge pull request #7669 from owncloud/versions_predeleteVincent Petry2014-03-121-1/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add preDelete hook for files_versions app
| * | | | | | | | add preDelete hook for files_versions appGeorg Ehrke2014-03-111-1/+4
| | |_|_|/ / / / | |/| | | | | |
* | | | | | | | Merge pull request #7668 from owncloud/trashbin_predeleteVincent Petry2014-03-121-0/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | add preDelete hook for files_trashbin app
| * | | | | | | | add preDelete hook for files_trashbin appGeorg Ehrke2014-03-111-0/+1
| |/ / / / / / /