summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7820 from owncloud/core-macwarningMorris Jobke2014-03-211-1/+10
|\
| * Added warning for Mac OS on setup pageVincent Petry2014-03-201-1/+10
* | Merge pull request #7611 from owncloud/fix-updaterVincent Petry2014-03-211-1/+1
|\ \
| * | Use $installedVersion instead of $currentVersionLukas Reschke2014-03-171-1/+1
* | | Merge pull request #7794 from owncloud/extstorage-obfuscatepasswordsLukas Reschke2014-03-202-70/+9
|\ \ \
| * | | Moved external storage mounting code to files_external appVincent Petry2014-03-191-70/+0
| * | | Added IV for ext storage password encryptionVincent Petry2014-03-191-0/+9
* | | | Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknownVincent Petry2014-03-201-1/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Still return quota value when free space is unknownVincent Petry2014-03-191-1/+8
* | | | Merge pull request #7732 from owncloud/datafolderexistenceVincent Petry2014-03-205-4/+42
|\ \ \ \
| * | | | Return 503 when a config/data dir error existsVincent Petry2014-03-142-0/+5
| * | | | Added .ocdata file to check for data folder validityVincent Petry2014-03-143-4/+37
* | | | | Merge pull request #7818 from owncloud/logException_undefined_variableMorris Jobke2014-03-201-5/+2
|\ \ \ \ \
| * | | | | Fix 'Undefined variable: message' in OCP\Util::logExceptionThomas Tanghus2014-03-201-5/+2
* | | | | | Merge pull request #7651 from owncloud/close-session-faster-masterThomas Müller2014-03-205-3/+64
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-195-417/+12
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | redefine reopen() in class \OC\Session\Internal to avoid accidental calls in ...Thomas Müller2014-03-181-0/+3
| * | | | | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-1782-467/+894
| |\ \ \ \ \
| * | | | | | introduce reopen() method to be used for unit test execution only - right aft...Thomas Müller2014-03-171-0/+7
| * | | | | | PHPDoc updatedThomas Müller2014-03-102-2/+13
| * | | | | | Merge branch 'master' into close-session-faster-masterThomas Müller2014-03-102-12/+13
| |\ \ \ \ \ \
| * | | | | | | fix close() implementation in \OC\Session\InternalThomas Müller2014-03-101-2/+9
| * | | | | | | close the session for all DAV calls right after authentication - no need to w...Thomas Müller2014-03-101-1/+15
| * | | | | | | adding an explicit close method to class session - write operations (set and ...Thomas Müller2014-03-104-1/+20
* | | | | | | | Add mimetype for MKV videosLukas Reschke2014-03-191-0/+1
| |_|_|/ / / / |/| | | | | |
* | | | | | | Merge pull request #7790 from owncloud/fix/7788Thomas Müller2014-03-193-417/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | drop file cache migration OC5 -> OC6Thomas Müller2014-03-183-417/+0
| | |_|/ / / | |/| | | |
* / | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-03-192-0/+12
|/ / / / /
* | | | | Merge pull request #7649 from owncloud/routing-publicThomas Müller2014-03-1711-60/+263
|\ \ \ \ \
| * | | | | update copyright headerRobin Appelman2014-03-101-1/+1
| * | | | | switch OC::getRouter usages to OC::$server->getRouterRobin Appelman2014-03-103-12/+4
| * | | | | Move the router classes to a namespace and expose it with a public interfaceRobin Appelman2014-03-109-50/+261
| |/ / / /
* | | | | Merge pull request #7764 from owncloud/datadir-chmodicewind19912014-03-172-30/+1
|\ \ \ \ \
| * | | | | use a non-recursive chmod on the datadirRobin Appelman2014-03-172-30/+1
* | | | | | Merge pull request #7760 from owncloud/core-roundbytesicewind19912014-03-171-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Correctly round bytes when converted from human readable formatVincent Petry2014-03-171-2/+2
| |/ / / /
* | | | | Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarningicewind19912014-03-171-1/+1
|\ \ \ \ \
| * | | | | Added warning for trusted_domains after CLI upgradeVincent Petry2014-03-141-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete...Vincent Petry2014-03-172-12/+58
|\ \ \ \ \
| * | | | | 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-172-54/+100
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | unit tests for specific image type output addedThomas Müller2014-03-171-1/+6
| * | | | | 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-163-0/+11