Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into load-apps-proper-master | Thomas Müller | 2014-03-21 | 240 | -2341/+3915 |
|\ | |||||
| * | Merge pull request #7611 from owncloud/fix-updater | Vincent Petry | 2014-03-21 | 1 | -1/+1 |
| |\ | |||||
| | * | Use $installedVersion instead of $currentVersion | Lukas Reschke | 2014-03-17 | 1 | -1/+1 |
| * | | Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords | Lukas Reschke | 2014-03-20 | 2 | -70/+9 |
| |\ \ | |||||
| | * | | Moved external storage mounting code to files_external app | Vincent Petry | 2014-03-19 | 1 | -70/+0 |
| | * | | Added IV for ext storage password encryption | Vincent Petry | 2014-03-19 | 1 | -0/+9 |
| * | | | Merge pull request #7808 from owncloud/quota-usequotaevenwhenfreespaceunknown | Vincent Petry | 2014-03-20 | 1 | -1/+8 |
| |\ \ \ | |||||
| | * | | | Still return quota value when free space is unknown | Vincent Petry | 2014-03-19 | 1 | -1/+8 |
| * | | | | Merge pull request #7732 from owncloud/datafolderexistence | Vincent Petry | 2014-03-20 | 5 | -4/+42 |
| |\ \ \ \ | |||||
| | * | | | | Return 503 when a config/data dir error exists | Vincent Petry | 2014-03-14 | 2 | -0/+5 |
| | * | | | | Added .ocdata file to check for data folder validity | Vincent Petry | 2014-03-14 | 3 | -4/+37 |
| * | | | | | Merge pull request #7818 from owncloud/logException_undefined_variable | Morris Jobke | 2014-03-20 | 1 | -5/+2 |
| |\ \ \ \ \ | |||||
| | * | | | | | Fix 'Undefined variable: message' in OCP\Util::logException | Thomas Tanghus | 2014-03-20 | 1 | -5/+2 |
| * | | | | | | Merge pull request #7651 from owncloud/close-session-faster-master | Thomas Müller | 2014-03-20 | 5 | -3/+64 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | Merge branch 'master' into close-session-faster-master | Thomas Müller | 2014-03-19 | 5 | -417/+12 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | * | | | | | redefine reopen() in class \OC\Session\Internal to avoid accidental calls in ... | Thomas Müller | 2014-03-18 | 1 | -0/+3 |
| | * | | | | | Merge branch 'master' into close-session-faster-master | Thomas Müller | 2014-03-17 | 82 | -467/+894 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | introduce reopen() method to be used for unit test execution only - right aft... | Thomas Müller | 2014-03-17 | 1 | -0/+7 |
| | * | | | | | | PHPDoc updated | Thomas Müller | 2014-03-10 | 2 | -2/+13 |
| | * | | | | | | Merge branch 'master' into close-session-faster-master | Thomas Müller | 2014-03-10 | 2 | -12/+13 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | fix close() implementation in \OC\Session\Internal | Thomas Müller | 2014-03-10 | 1 | -2/+9 |
| | * | | | | | | | close the session for all DAV calls right after authentication - no need to w... | Thomas Müller | 2014-03-10 | 1 | -1/+15 |
| | * | | | | | | | adding an explicit close method to class session - write operations (set and ... | Thomas Müller | 2014-03-10 | 4 | -1/+20 |
| * | | | | | | | | Add mimetype for MKV videos | Lukas Reschke | 2014-03-19 | 1 | -0/+1 |
| | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | Merge pull request #7790 from owncloud/fix/7788 | Thomas Müller | 2014-03-19 | 3 | -417/+0 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | |||||
| | * | | | | | | drop file cache migration OC5 -> OC6 | Thomas Müller | 2014-03-18 | 3 | -417/+0 |
| | | |_|/ / / | | |/| | | | | |||||
| * / | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-19 | 2 | -0/+12 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #7649 from owncloud/routing-public | Thomas Müller | 2014-03-17 | 11 | -60/+263 |
| |\ \ \ \ \ | |||||
| | * | | | | | update copyright header | Robin Appelman | 2014-03-10 | 1 | -1/+1 |
| | * | | | | | switch OC::getRouter usages to OC::$server->getRouter | Robin Appelman | 2014-03-10 | 3 | -12/+4 |
| | * | | | | | Move the router classes to a namespace and expose it with a public interface | Robin Appelman | 2014-03-10 | 9 | -50/+261 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #7764 from owncloud/datadir-chmod | icewind1991 | 2014-03-17 | 2 | -30/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | use a non-recursive chmod on the datadir | Robin Appelman | 2014-03-17 | 2 | -30/+1 |
| * | | | | | | Merge pull request #7760 from owncloud/core-roundbytes | icewind1991 | 2014-03-17 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| | * | | | | | Correctly round bytes when converted from human readable format | Vincent Petry | 2014-03-17 | 1 | -2/+2 |
| | |/ / / / | |||||
| * | | | | | Merge pull request #7727 from owncloud/cli-trusteddomainupgradewarning | icewind1991 | 2014-03-17 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Added warning for trusted_domains after CLI upgrade | Vincent Petry | 2014-03-14 | 1 | -1/+1 |
| | | |_|_|/ | | |/| | | | |||||
| * | | | | | Merge pull request #7704 from owncloud/preview_use_pre_instead_of_post_delete... | Vincent Petry | 2014-03-17 | 2 | -12/+58 |
| |\ \ \ \ \ | |||||
| | * | | | | | improve validation of getFileInfo in \OC\Preview | Georg Ehrke | 2014-03-13 | 1 | -8/+20 |
| | * | | | | | use preDelete instead of postDelete hook | Georg Ehrke | 2014-03-13 | 2 | -4/+38 |
| * | | | | | | Merge pull request #7728 from owncloud/oc_image_show_save_custom_mime | Vincent Petry | 2014-03-17 | 2 | -54/+100 |
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| | * | | | | | unit tests for specific image type output added | Thomas Müller | 2014-03-17 | 1 | -1/+6 |
| | * | | | | | fixing PHPDoc | Thomas Müller | 2014-03-17 | 1 | -49/+58 |
| | * | | | | | OC_Image::_output() - throw exception instead of falling back to png | Georg Ehrke | 2014-03-14 | 1 | -1/+1 |
| | * | | | | | remove image/pjpeg from OC_Image::_output | Georg Ehrke | 2014-03-14 | 1 | -1/+0 |
| | * | | | | | don't change mimetype of whole image object | Georg Ehrke | 2014-03-14 | 1 | -6/+6 |
| | * | | | | | always output a png | Georg Ehrke | 2014-03-14 | 1 | -1/+1 |
| | * | | | | | make it possible to influence output type of \OC_Image | Georg Ehrke | 2014-03-14 | 1 | -7/+40 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-16 | 3 | -0/+11 |
| * | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-03-15 | 2 | -0/+12 |