| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 |
| * | Move session_regenerate_id to `login()` | Lukas Reschke | 2014-02-21 | 1 | -0/+1 |
| * | 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 | 23 | -148/+304 |
| | |\ \ |
|
| | * | | | 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 | Tigran Mkrtchyan | 2014-01-29 | 1 | -5/+5 |
| * | | | | | Merge pull request #6935 from owncloud/fix_urlGenerator | Björn Schießle | 2014-02-20 | 1 | -1/+2 |
| |\ \ \ \ \ |
|
| | * | | | | | 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 |
| |\ \ \ \ \ \ |
|
| | * \ \ \ \ \ | 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 |
| |\ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | 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 |
| * | | | | | | | | | Merge pull request #7301 from owncloud/fix-fuckup | icewind1991 | 2014-02-20 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | 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 | Bjoern Schiessle | 2014-02-19 | 1 | -0/+160 |
| * | | | | | | | | | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix | Lukas Reschke | 2014-02-20 | 6 | -4/+53 |
| |\ \ \ \ \ \ \ \ \ \ |
|
| | * | | | | | | | | | | Added file name check in webdav connector | Vincent Petry | 2014-02-18 | 3 | -4/+20 |
| | * | | | | | | | | | | Added extra checks for invalid file chars in newfile.php and newfolder.php | Vincent Petry | 2014-02-18 | 3 | -0/+33 |
| * | | | | | | | | | | | Hardening: Remove dangerous characters + Subdirectory Check | Lukas Reschke | 2014-02-19 | 1 | -2/+2 |
| | |_|/ / / / / / / /
| |/| | | | | | | | | |
|
* / | | | | | | | | | | reduce width of searchbox on mobile, fix overlap, fix #7282 | Jan-Christoph Borchardt | 2014-02-20 | 1 | -0/+1 |
|/ / / / / / / / / / |
|
* | | | | | | | | | | 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 | Vincent Petry | 2014-02-13 | 1 | -1/+8 |
* | | | | | | | | | | Merge pull request #7274 from owncloud/scrutinizer-patch-1 | Morris Jobke | 2014-02-19 | 61 | -63/+134 |
|\ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | fix wrong removes | Morris Jobke | 2014-02-19 | 1 | -1/+24 |
| * | | | | | | | | | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 61 | -85/+133 |
* | | | | | | | | | | | 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 | Robin Appelman | 2014-02-18 | 1 | -13/+33 |
* | | | | | | | | | | | | 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 | Robin Appelman | 2014-02-18 | 1 | -8/+1 |
| |/ / / / / / / / / / |
|
* | | | | | | | | | | | Merge pull request #7114 from owncloud/scrutinizer_documentation_patches | Thomas Müller | 2014-02-19 | 116 | -265/+528 |
|\ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-18 | 21 | -169/+272 |
| |\ \ \ \ \ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 33 | -156/+869 |
| |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| * | | | | | | | | | | | | | Fix more documentation failes | Joas Schilling | 2014-02-08 | 16 | -141/+111 |
| * | | | | | | | | | | | | | remove duplicate param lines for OCP\User::getUsers() | Jörn Friedrich Dreyer | 2014-02-07 | 1 | -2/+0 |
| * | | | | | | | | | | | | | polish documentation based on scrutinizer patches | Jörn Friedrich Dreyer | 2014-02-06 | 116 | -150/+448 |
* | | | | | | | | | | | | | | Merge pull request #7253 from owncloud/preferences-caching | icewind1991 | 2014-02-18 | 1 | -37/+86 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| |_|_|/ / / / / / / / / / /
|/| | | | | | | | | | | | | |
|
| * | | | | | | | | | | | | | remove some unneeded isset's | Robin Appelman | 2014-02-18 | 1 | -5/+3 |
| * | | | | | | | | | | | | | Fix some phpdoc | Robin Appelman | 2014-02-18 | 1 | -1/+9 |