| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | don't overwrite keys if rename was done by a stream copy | Bjoern Schiessle | 2014-02-24 | 1 | -0/+2 |
| | | |||||
| * | 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 | 2 | -1/+1 |
| |\ \ | |||||
| | * | | 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 |
| | | | | |||||
| * | | | 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 |
| | | |\ \ | |||||
| | | * \ \ | 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 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | mount: make location of mount.json configurable | ||||
| | | * | | | | | mount: make location of mount.json configurable | Tigran Mkrtchyan | 2014-01-29 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not share users data with config files Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de> | ||||
| | * | | | | | | Merge pull request #6935 from owncloud/fix_urlGenerator | Björn Schießle | 2014-02-20 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add missing slash in URLGenerator::getAbsoluteURL(). | ||||
| | | * | | | | | | Test if $url is already prefixed by '/' | Thomas Tanghus | 2014-02-07 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840 | Thomas Tanghus | 2014-01-24 | 1 | -1/+1 |
| | | | | | | | | | |||||
| | * | | | | | | | Merge pull request #7289 from owncloud/fix-filetype-icons | Lukas Reschke | 2014-02-20 | 2 | -65/+106 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Fix filetype icons | ||||
| | | * \ \ \ \ \ \ | merge master | Jan-Christoph Borchardt | 2014-02-20 | 1 | -1/+8 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | fix filetype icons for gzip, tex, perl, csv, sh | Jan-Christoph Borchardt | 2014-02-20 | 2 | -1/+8 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | coding style: spaces around => | Jan-Christoph Borchardt | 2014-02-19 | 1 | -66/+66 |
| | | | | | | | | | | | |||||
| | | * | | | | | | | | fix lots of file type icons for archives, js, flash, ics, fonts, code, ... | Jan-Christoph Borchardt | 2014-02-19 | 2 | -2/+36 |
| | | | | | | | | | | | |||||
| | * | | | | | | | | | Merge pull request #6519 from nhirokinet/master | Lukas Reschke | 2014-02-20 | 2 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | Security Update: session fixation | ||||
| | | * | | | | | | | | | Update user.php to fix duplicate session-duplicate | nhirokinet | 2013-12-22 | 1 | -1/+0 |
| | | | | | | | | | | | | |||||
| | | * | | | | | | | | | Security Update: session fixation | NARUKAWA Hiroki | 2013-12-20 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous version is vulnerable to session fixation attack in some situations, guessing non-apache-module-php5 environment. Regeneration of session id should be done here. | ||||
| * | | | | | | | | | | | kill $coreStyles and $coreScripts | Thomas Müller | 2014-02-20 | 2 | -13/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | remove unused functions - have been introduced with the old minimizer approach | Thomas Müller | 2014-02-20 | 1 | -27/+0 |
| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' into no-css-js-delivery-via-php | Thomas Müller | 2014-02-20 | 55 | -71/+347 |
| |\| | | | | | | | | | | |||||
| | * | | | | | | | | | | Merge pull request #7301 from owncloud/fix-fuckup | icewind1991 | 2014-02-20 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fix master - #7274 brokes it | ||||
| | | * | | | | | | | | | | fix master - #7274 brokes it | Morris Jobke | 2014-02-20 | 1 | -0/+1 |
| | | | |_|/ / / / / / / | | |/| | | | | | | | | |||||
| | * | | | | | | | | | | Merge pull request #7247 from owncloud/sharing_cleanup_step1 | Björn Schießle | 2014-02-20 | 1 | -0/+160 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | clean up the sharing ajax calls, add mail notification class | ||||
| | | * | | | | | | | | | | clean up the sharing ajax calls, add mail notification class | Bjoern Schiessle | 2014-02-19 | 1 | -0/+160 |
| | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix | Lukas Reschke | 2014-02-20 | 4 | -4/+41 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Added extra checks for invalid file chars in newfile.php and newfolder.php | ||||
| | | * | | | | | | | | | | | Added file name check in webdav connector | Vincent Petry | 2014-02-18 | 3 | -4/+20 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added file name check for the put, rename and setNames() methods which throw a "Bad Request" whenever invalid characters are used - replaced \OC\Filesystem usage with $this->getFS() to be able to write unit tests | ||||
| | | * | | | | | | | | | | | Added extra checks for invalid file chars in newfile.php and newfolder.php | Vincent Petry | 2014-02-18 | 1 | -0/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - added PHP utility function to check for file name validity - fixes issue where a user can create a file called ".." from the files UI - added extra checks to make sure newfile.php and newfolder.php also check for invalid characters | ||||
| | * | | | | | | | | | | | | Hardening: Remove dangerous characters + Subdirectory Check | Lukas Reschke | 2014-02-19 | 1 | -2/+2 |
| | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | If an user is able to create folders in /core/l10n/ he is able to execute arbitrary code. Therefore I've added an `issubdirectory` check and removed all potential dangerous characters from `$lang`. | ||||
| | * | | | | | | | | | | | Merge pull request #7195 from owncloud/files-selectall | Vincent Petry | 2014-02-19 | 1 | -1/+8 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | Do not send file list for select all on Download/delete | ||||
| | | * | | | | | | | | | | Do not send file list for select all on Download/delete | Vincent Petry | 2014-02-13 | 1 | -1/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When all files are selected, do not send the whole file list - Download will trigger download for the parent folder, also works with root - Delete will send "allfiles" to the server that will find the file list or the passed directory by itself | ||||
| | * | | | | | | | | | | | Merge pull request #7274 from owncloud/scrutinizer-patch-1 | Morris Jobke | 2014-02-19 | 51 | -52/+103 |
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Scrutinizer Auto-Fixes | ||||
| | | * | | | | | | | | | | | fix wrong removes | Morris Jobke | 2014-02-19 | 1 | -1/+24 |
| | | | | | | | | | | | | | | |||||
| | | * | | | | | | | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 51 | -74/+102 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend | ||||
| | * | | | | | | | | | | | | Merge pull request #7260 from owncloud/watcher-policy | icewind1991 | 2014-02-19 | 1 | -13/+33 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow setting the frequency of which the file watcher checks for updates | ||||
| | | * | | | | | | | | | | | | Allow setting the frequency of which the file watcher checks for updates | Robin Appelman | 2014-02-18 | 1 | -13/+33 |
| | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | | | integrate assetic for asset pipeline-ing | Thomas Müller | 2014-02-20 | 1 | -25/+88 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | enable static delivery of css files | Thomas Müller | 2014-02-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | kill references to core.js and core.css | Thomas Müller | 2014-02-20 | 1 | -2/+0 |
| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | kill old minimizer code | Thomas Müller | 2014-02-20 | 3 | -123/+0 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | Merge pull request #7257 from owncloud/filelist-fileinfo | Vincent Petry | 2014-02-19 | 1 | -8/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | | | use a FileInfo object of the directory when generting the filelist | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| aboutsummaryrefslogtreecommitdiffstats |