Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7453 from owncloud/preview-fileinfo | Vincent Petry | 2014-03-03 | 1 | -115/+126 |
|\ | |||||
| * | Cache the fileinfo in OC\Preview | Robin Appelman | 2014-02-27 | 1 | -115/+126 |
* | | Merge pull request #7500 from owncloud/theme-mailtemplate | Frank Karlitschek | 2014-03-03 | 1 | -0/+14 |
|\ \ | |||||
| * | | make mail notification header color themable | Jan-Christoph Borchardt | 2014-03-03 | 1 | -0/+14 |
* | | | Allow XML entity loader for MDB2 schema loader | Vincent Petry | 2014-03-03 | 1 | -0/+2 |
|/ / | |||||
* | | Fix some docstrings in l10n.php | kondou | 2014-03-01 | 1 | -13/+15 |
* | | Merge pull request #7444 from owncloud/fix/7443 | Thomas Müller | 2014-02-28 | 2 | -23/+9 |
|\ \ | |||||
| * | | add BMP mimetype for BMP previews | Morris Jobke | 2014-02-27 | 1 | -0/+1 |
| * | | remove unused code and fix wrong variable names - some PHPDoc updated | Thomas Müller | 2014-02-26 | 1 | -23/+8 |
| |/ | |||||
* | | Merge pull request #7471 from owncloud/fix-css-loading | Morris Jobke | 2014-02-28 | 1 | -1/+1 |
|\ \ | |||||
| * | | CSS is now loaded directly instead via PHP | Lukas Reschke | 2014-02-28 | 1 | -1/+1 |
* | | | Merge pull request #7455 from owncloud/rawlist-fileinfo | icewind1991 | 2014-02-28 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | |||||
| * | | Update rawlist to work with new fileinfo object | Robin Appelman | 2014-02-27 | 1 | -1/+1 |
| |/ | |||||
* / | Also quote old column name during DB migration | Vincent Petry | 2014-02-27 | 1 | -0/+3 |
|/ | |||||
* | Merge pull request #7279 from owncloud/folderid-reuse | icewind1991 | 2014-02-26 | 2 | -2/+13 |
|\ | |||||
| * | Remove fileid parameter for getFolderContent | Robin Appelman | 2014-02-21 | 1 | -5/+2 |
| * | Split getFolderContentById | Robin Appelman | 2014-02-21 | 1 | -0/+10 |
| * | Merge branch 'master' into folderid-reuse | Robin Appelman | 2014-02-21 | 59 | -146/+470 |
| |\ | |||||
| * | | Reuse the folder id in View->getFolderContents | Robin Appelman | 2014-02-19 | 2 | -4/+8 |
* | | | Merge pull request #7399 from owncloud/themable-doc-links | Jan-Christoph Borchardt | 2014-02-26 | 2 | -1/+8 |
|\ \ \ | |||||
| * | | | introduce new theme function to allow full creation of documentation links: b... | Thomas Müller | 2014-02-25 | 2 | -1/+8 |
* | | | | Merge pull request #7328 from owncloud/McNetic-zipstreamer | Vincent Petry | 2014-02-26 | 1 | -112/+101 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Merge branch 'master' into McNetic-zipstreamer | Thomas Müller | 2014-02-24 | 10 | -206/+136 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into McNetic-zipstreamer | Thomas Müller | 2014-02-21 | 9 | -75/+123 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into M... | Thomas Müller | 2014-02-20 | 1 | -112/+101 |
| |\ \ \ \ | |||||
| | * | | | | switched zip file creation to ZipStreamer to create zip files directly in memory | Nicolai Ehemann | 2014-01-22 | 1 | -33/+9 |
| | * | | | | refactored/cleaned up lib/files.php | Nicolai Ehemann | 2014-01-22 | 1 | -77/+84 |
| | * | | | | lib/files.php: make use of === instead of == | Nicolai Ehemann | 2014-01-18 | 1 | -4/+4 |
* | | | | | | Merge pull request #7335 from owncloud/fix-7333 | Vincent Petry | 2014-02-25 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix path to the mount file | Lukas Reschke | 2014-02-20 | 1 | -1/+2 |
* | | | | | | | Merge pull request #7371 from owncloud/core-storagemovedeleteall | Vincent Petry | 2014-02-25 | 2 | -38/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Removed unused deleteAll method on Common storage class | Vincent Petry | 2014-02-24 | 1 | -37/+0 |
| * | | | | | | | Replace deleteAll call with unlink call | Vincent Petry | 2014-02-24 | 1 | -1/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
* | | | | | | | Merge pull request #7374 from owncloud/enc_dont_overwrite_keys | Björn Schießle | 2014-02-25 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | don't overwrite keys if rename was done by a stream copy | Bjoern Schiessle | 2014-02-24 | 1 | -0/+2 |
| |/ / / / / / | |||||
* / / / / / / | Fix case where port is missing | Vincent Petry | 2014-02-25 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #7259 from owncloud/overwritehost-always | Lukas Reschke | 2014-02-22 | 3 | -15/+47 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add overwritehost config on setup and upgrade | Lukas Reschke | 2014-02-21 | 3 | -15/+47 |
* | | | | | | | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-21 | 2 | -1/+1 |
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Remove `session_id_regenerate` from here | Lukas Reschke | 2014-02-21 | 1 | -1/+0 |
| * | | | | | | Move session_regenerate_id to `login()` | Lukas Reschke | 2014-02-21 | 1 | -0/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-21 | 9 | -75/+123 |
|\| | | | | | |||||
| * | | | | | Merge pull request #6962 from owncloud/quota-space-root | Thomas Müller | 2014-02-20 | 3 | -3/+9 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'master' into quota-space-root | Robin Appelman | 2014-02-10 | 7 | -13/+22 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge branch 'master' into quota-space-root | Robin Appelman | 2014-02-07 | 18 | -143/+239 |
| | |\ \ \ \ \ \ | |||||
| | * | | | | | | | Don't create new thumbnails on the write hook | Robin Appelman | 2014-02-04 | 1 | -1/+1 |
| | * | | | | | | | Actually rename the variable | Robin Appelman | 2014-01-27 | 1 | -2/+2 |
| | * | | | | | | | Fix phpdoc | Robin Appelman | 2014-01-27 | 1 | -1/+1 |
| | * | | | | | | | Allow passing a root folder to get the used space from in the quota wrapper | Robin Appelman | 2014-01-27 | 2 | -2/+8 |
| * | | | | | | | | Merge pull request #6999 from kofemann/mount-config | Lukas Reschke | 2014-02-20 | 1 | -5/+5 |
| |\ \ \ \ \ \ \ \ |