| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Allow XML entity loader for MDB2 schema loader | Vincent Petry | 2014-03-03 | 1 | -0/+2 |
| | | | | | Forward port of 762b0d9 from stable6 to master | ||||
| * | Merge pull request #7486 from owncloud/l10n_docstrings | Morris Jobke | 2014-03-01 | 1 | -13/+15 |
| |\ | | | | | Fix some docstrings in l10n.php | ||||
| | * | Fix some docstrings in l10n.php | kondou | 2014-03-01 | 1 | -13/+15 |
| | | | |||||
| * | | Merge pull request #7433 from owncloud/config_basic_auth | Thomas Tanghus | 2014-03-01 | 1 | -1/+2 |
| |\ \ | |/ |/| | Config to disable basic_auth username checking | ||||
| | * | Config to disable basic_auth username chacking | kondou | 2014-02-26 | 1 | -1/+2 |
| | | | | | | | | | This can be confusing and/or annoying | ||||
| * | | Merge pull request #7444 from owncloud/fix/7443 | Thomas Müller | 2014-02-28 | 2 | -23/+9 |
| |\ \ | | | | | | | remove unused code and fix wrong variable names - some PHPDoc updated | ||||
| | * | | 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 | ||||
| | * | | CSS is now loaded directly instead via PHP | Lukas Reschke | 2014-02-28 | 1 | -1/+1 |
| | | | | | | | | | | 269f24cf9617397aaf501b27ec1af2c8e3154cf8 was not changed in setup.php which prevented loading of CSS files in some environments (e.g. my local setup) for apps. | ||||
| * | | | Merge pull request #7455 from owncloud/rawlist-fileinfo | icewind1991 | 2014-02-28 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | Update rawlist to work with new fileinfo object | ||||
| | * | | 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 |
| |/ | | | | This fixes alter table commands that didn't quote the old column name | ||||
| * | Merge pull request #3760 from IMM0rtalis/remove_logout_redirect_slash | Bart Visscher | 2014-02-26 | 1 | -1/+2 |
| |\ | | | | | - removed slash-adding for logout-header-redirect | ||||
| | * | - add slash if webroot is an empty string | Florian Scholz | 2013-06-25 | 1 | -1/+2 |
| | | | | | | | | | - added comment | ||||
| | * | - removed slash-adding for logout-header-redirect | Florian Scholz | 2013-06-17 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #7393 from owncloud/fix_path_in_sharing_results | Björn Schießle | 2014-02-26 | 1 | -1/+15 |
| |\ \ | | | | | | | fix path in sharing results if it is a file in the Shared folder | ||||
| | * | | fix path in sharing results if it is a file in the Shared folder | Bjoern Schiessle | 2014-02-25 | 1 | -1/+15 |
| | | | | |||||
| * | | | Merge pull request #7279 from owncloud/folderid-reuse | icewind1991 | 2014-02-26 | 2 | -2/+13 |
| |\ \ \ | | | | | | | | | Reuse the folder id in View->getFolderContents | ||||
| | * | | | 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 | 72 | -157/+514 |
| | |\ \ \ | |||||
| | * | | | | 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 lin... | ||||
| | * | | | | | introduce new theme function to allow full creation of documentation links: ↵ | Thomas Müller | 2014-02-25 | 2 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | buildDocLinkToKey() | ||||
| * | | | | | | Merge pull request #7328 from owncloud/McNetic-zipstreamer | Vincent Petry | 2014-02-26 | 1 | -112/+101 |
| |\ \ \ \ \ \ | |/ / / / / |/| | | | | | McNetic zipstreamer | ||||
| | * | | | | | Merge branch 'master' into McNetic-zipstreamer | Thomas Müller | 2014-02-24 | 11 | -228/+136 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: 3rdparty | ||||
| | * \ \ \ \ \ | Merge branch 'master' into McNetic-zipstreamer | Thomas Müller | 2014-02-21 | 10 | -75/+124 |
| | |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | | Merge branch 'zipstreamer' of https://github.com/McNetic/owncloud_core into ↵ | Thomas Müller | 2014-02-20 | 1 | -112/+101 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | McNetic-zipstreamer Conflicts: lib/private/files.php | ||||
| | | * | | | | | | 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 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleaned up get() logic fixed get() to only send headers if requested (xsendfile could get in the way) do no longer readfile() when already using mod_xsendfile or similar | ||||
| | | * | | | | | | 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 code to search for mount.json in custom data folders | ||||
| | * | | | | | | | 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 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Replace deleteAll call with unlink call on rename | ||||
| | * | | | | | | | | Removed unused deleteAll method on Common storage class | Vincent Petry | 2014-02-24 | 1 | -37/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "deleteAll" method on the Common storage class isn't used anywhere. Also, it isn't defined on the Storage interface so this fix removes it completely. | ||||
| | * | | | | | | | | Replace deleteAll call with unlink call | Vincent Petry | 2014-02-24 | 1 | -1/+1 |
| | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method deleteAll() doesn't officially exist on the Storage class as it's not defined on the interface, which means it fails on the Quota storage wrapper and might fail on some external storage classes. Also, this here is the only use case for that one method. | ||||
| * | | | | | | | | Merge pull request #7374 from owncloud/enc_dont_overwrite_keys | Björn Schießle | 2014-02-25 | 1 | -0/+2 |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | [encryption] don't overwrite keys if rename was done by a stream copy | ||||
| | * | | | | | | | | 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 |
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | Forward port of 6d3b5b24fd4f82c1cbfbc4cade5246a0335f8dda to master | ||||
| * | | | | | | | Merge pull request #7259 from owncloud/overwritehost-always | Lukas Reschke | 2014-02-22 | 3 | -15/+47 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add overwritehost config on setup and upgrade | ||||
| | * | | | | | | | 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 | 3 | -1/+2 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| | * | | | | | | | Merge branch 'master' into mobile-header | Robin Appelman | 2014-02-21 | 16 | -81/+339 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | Remove `session_id_regenerate` from here | Lukas Reschke | 2014-02-21 | 1 | -1/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Jenkins somewhat complains that there are already sent headers. | ||||
| | | * | | | | | | | Move session_regenerate_id to `login()` | Lukas Reschke | 2014-02-21 | 1 | -0/+1 |
| | | | |/ / / / / | | |/| | | | | | |||||
| | * | | | | | | | reduce width of searchbox on mobile, fix overlap, fix #7282 | Jan-Christoph Borchardt | 2014-02-20 | 1 | -0/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-21 | 9 | -75/+123 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | Conflicts: config/config.sample.php | ||||
| | * | | | | | | | Merge pull request #6962 from owncloud/quota-space-root | Thomas Müller | 2014-02-20 | 3 | -3/+9 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Allow passing a root folder to get the used space from in the quota wrapper | ||||
| | | * \ \ \ \ \ \ | Merge branch 'master' into quota-space-root | Robin Appelman | 2014-02-10 | 7 | -13/+22 |
| | | |\ \ \ \ \ \ \ | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |