summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | move replace to inside issetMyles McNamara2014-02-281-2/+2
| * | | | | | | | replace spaces in download link without encoding entire URLMyles McNamara2014-02-281-0/+2
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge pull request #7453 from owncloud/preview-fileinfoVincent Petry2014-03-031-115/+126
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Cache the fileinfo in OC\PreviewRobin Appelman2014-02-271-115/+126
* | | | | | | | Merge pull request #7500 from owncloud/theme-mailtemplateFrank Karlitschek2014-03-031-0/+14
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | make mail notification header color themableJan-Christoph Borchardt2014-03-031-0/+14
* | | | | | | | Allow XML entity loader for MDB2 schema loaderVincent Petry2014-03-031-0/+2
|/ / / / / / /
* | | | | | | Merge pull request #7486 from owncloud/l10n_docstringsMorris Jobke2014-03-011-13/+15
|\ \ \ \ \ \ \
| * | | | | | | Fix some docstrings in l10n.phpkondou2014-03-011-13/+15
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #7433 from owncloud/config_basic_authThomas Tanghus2014-03-011-1/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Config to disable basic_auth username chackingkondou2014-02-261-1/+2
| |/ / / / /
* | | | | | Merge pull request #7444 from owncloud/fix/7443Thomas Müller2014-02-282-23/+9
|\ \ \ \ \ \
| * | | | | | add BMP mimetype for BMP previewsMorris Jobke2014-02-271-0/+1
| * | | | | | remove unused code and fix wrong variable names - some PHPDoc updatedThomas Müller2014-02-261-23/+8
| |/ / / / /
* | | | | | Merge pull request #7471 from owncloud/fix-css-loadingMorris Jobke2014-02-281-1/+1
|\ \ \ \ \ \
| * | | | | | CSS is now loaded directly instead via PHPLukas Reschke2014-02-281-1/+1
* | | | | | | Merge pull request #7455 from owncloud/rawlist-fileinfoicewind19912014-02-281-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update rawlist to work with new fileinfo objectRobin Appelman2014-02-271-1/+1
| |/ / / / /
* / / / / / Also quote old column name during DB migrationVincent Petry2014-02-271-0/+3
|/ / / / /
* | | | | Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slashBart Visscher2014-02-261-1/+2
|\ \ \ \ \
| * | | | | - add slash if webroot is an empty stringFlorian Scholz2013-06-251-1/+2
| * | | | | - removed slash-adding for logout-header-redirectFlorian Scholz2013-06-171-1/+1
* | | | | | Merge pull request #7393 from owncloud/fix_path_in_sharing_resultsBjörn Schießle2014-02-261-1/+15
|\ \ \ \ \ \
| * | | | | | fix path in sharing results if it is a file in the Shared folderBjoern Schiessle2014-02-251-1/+15
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #7279 from owncloud/folderid-reuseicewind19912014-02-262-2/+13
|\ \ \ \ \ \
| * | | | | | Remove fileid parameter for getFolderContentRobin Appelman2014-02-211-5/+2
| * | | | | | Split getFolderContentByIdRobin Appelman2014-02-211-0/+10
| * | | | | | Merge branch 'master' into folderid-reuseRobin Appelman2014-02-2172-157/+514
| |\ \ \ \ \ \
| * | | | | | | Reuse the folder id in View->getFolderContentsRobin Appelman2014-02-192-4/+8
* | | | | | | | Merge pull request #7399 from owncloud/themable-doc-linksJan-Christoph Borchardt2014-02-262-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | introduce new theme function to allow full creation of documentation links: b...Thomas Müller2014-02-252-1/+8
* | | | | | | | | Merge pull request #7328 from owncloud/McNetic-zipstreamerVincent Petry2014-02-261-112/+101
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Merge branch 'master' into McNetic-zipstreamerThomas Müller2014-02-2411-228/+136
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into McNetic-zipstreamerThomas Müller2014-02-2110-75/+124
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into M...Thomas Müller2014-02-201-112/+101
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | switched zip file creation to ZipStreamer to create zip files directly in memoryNicolai Ehemann2014-01-221-33/+9
| | * | | | | | | | | refactored/cleaned up lib/files.phpNicolai Ehemann2014-01-221-77/+84
| | * | | | | | | | | lib/files.php: make use of === instead of ==Nicolai Ehemann2014-01-181-4/+4
* | | | | | | | | | | Merge pull request #7335 from owncloud/fix-7333Vincent Petry2014-02-251-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix path to the mount fileLukas Reschke2014-02-201-1/+2
* | | | | | | | | | | Merge pull request #7371 from owncloud/core-storagemovedeleteallVincent Petry2014-02-252-38/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Removed unused deleteAll method on Common storage classVincent Petry2014-02-241-37/+0
| * | | | | | | | | | | Replace deleteAll call with unlink callVincent Petry2014-02-241-1/+1
| | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #7374 from owncloud/enc_dont_overwrite_keysBjörn Schießle2014-02-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | don't overwrite keys if rename was done by a stream copyBjoern Schiessle2014-02-241-0/+2
| |/ / / / / / / / / /
* / / / / / / / / / / Fix case where port is missingVincent Petry2014-02-251-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #7259 from owncloud/overwritehost-alwaysLukas Reschke2014-02-223-15/+47
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add overwritehost config on setup and upgradeLukas Reschke2014-02-213-15/+47
* | | | | | | | | | | Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-213-1/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into mobile-headerRobin Appelman2014-02-2116-81/+339
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |