| Commit message (Expand) | Author | Age | Files | Lines |
|---|
| * | Merge branch 'master' into mimeicons-svg | Robin Appelman | 2014-02-20 | 231 | -3412/+2134 |
| |\ |
|
| | * | Merge pull request #6962 from owncloud/quota-space-root | Thomas Müller | 2014-02-20 | 4 | -6/+31 |
| | |\ |
|
| | | * | Merge branch 'master' into quota-space-root | Robin Appelman | 2014-02-10 | 20 | -35/+68 |
| | | |\ |
|
| | | * \ | Merge branch 'master' into quota-space-root | Robin Appelman | 2014-02-07 | 98 | -733/+2170 |
| | | |\ \ |
|
| | | * | | | Don't create new thumbnails on the write hook | Robin Appelman | 2014-02-04 | 1 | -1/+1 |
| | | * | | | Add unit test for quote wrapper size root | Robin Appelman | 2014-02-04 | 1 | -3/+22 |
| | | * | | | 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 #7056 from owncloud/users-scrollperformance | Jan-Christoph Borchardt | 2014-02-20 | 3 | -25/+76 |
| | |\ \ \ \ |
|
| | | * | | | | Added loading spinner to users list on scroll | Vincent Petry | 2014-02-18 | 1 | -0/+4 |
| | | * | | | | Improve users list scrolling performance | Vincent Petry | 2014-02-17 | 3 | -25/+72 |
| | * | | | | | Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fix | Jan-Christoph Borchardt | 2014-02-20 | 1 | -5/+0 |
| | |\ \ \ \ \ |
|
| | | * | | | | | remove fix for IE9 nav bar width | Konstantin.Popov | 2014-01-17 | 1 | -5/+0 |
| | * | | | | | | Merge pull request #7290 from owncloud/issue/5463 | icewind1991 | 2014-02-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ |
|
| | | * | | | | | | Correctly redirect to settings page when not selecting cert file for upload | Joas Schilling | 2014-02-19 | 1 | -1/+1 |
| | * | | | | | | | Merge pull request #7205 from owncloud/fix_7153 | blizzz | 2014-02-20 | 1 | -0/+6 |
| | |\ \ \ \ \ \ \ |
|
| | | * | | | | | | | LDAP: prevent other configuration from being deleted when deleting the first ... | Arthur Schiwon | 2014-02-14 | 1 | -0/+6 |
| | * | | | | | | | | Merge pull request #7319 from owncloud/remote-unneeded-if | Morris Jobke | 2014-02-20 | 1 | -5/+1 |
| | |\ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | Remove no longer needed if statement | Robin Appelman | 2014-02-20 | 1 | -5/+1 |
| | * | | | | | | | | | Merge pull request #6999 from kofemann/mount-config | Lukas Reschke | 2014-02-20 | 3 | -9/+10 |
| | |\ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | mount: make location of mount.json configurable | Tigran Mkrtchyan | 2014-01-29 | 3 | -9/+10 |
| | * | | | | | | | | | | 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 | 8 | -65/+106 |
| | |\ \ \ \ \ \ \ \ \ \ \
| | |_|_|/ / / / / / / /
| |/| | | | | | | | | | |
|
| | | * | | | | | | | | | | merge master | Jan-Christoph Borchardt | 2014-02-20 | 184 | -2983/+1340 |
| | | |\ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | fix filetype icons for gzip, tex, perl, csv, sh | Jan-Christoph Borchardt | 2014-02-20 | 2 | -1/+8 |
| | | * | | | | | | | | | | | Optimize images | kondou | 2014-02-19 | 6 | -122/+108 |
| | | * | | | | | | | | | | | 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 | 8 | -2/+36 |
| | * | | | | | | | | | | | | Merge pull request #7315 from owncloud/Jakobud-core-css-logos | Jan-Christoph Borchardt | 2014-02-20 | 3 | -3/+17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-core | Jörn Friedrich Dreyer | 2014-02-20 | 3 | -3/+17 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | | * | | | | | | | | | | | | Moved Core Theme Logos to CSS | Jake Wilson | 2013-10-10 | 3 | -3/+17 |
| | * | | | | | | | | | | | | | | Merge pull request #7036 from LeBlaaanc/patch-1 | Thomas Müller | 2014-02-20 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | Removed '/'. Fixes #7035. | Chris LeBlanc | 2014-02-01 | 1 | -1/+1 |
| | * | | | | | | | | | | | | | | | 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 | 2 | -99/+173 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | clean up the sharing ajax calls, add mail notification class | Bjoern Schiessle | 2014-02-19 | 2 | -99/+173 |
| | * | | | | | | | | | | | | | | | | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix | Lukas Reschke | 2014-02-20 | 11 | -10/+169 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | Added file name check in webdav connector | Vincent Petry | 2014-02-18 | 5 | -4/+76 |
| | | * | | | | | | | | | | | | | | | | | Added extra checks for invalid file chars in newfile.php and newfolder.php | Vincent Petry | 2014-02-18 | 6 | -6/+93 |
| | * | | | | | | | | | | | | | | | | | | Merge pull request #7287 from owncloud/subdirectory-harden | Lukas Reschke | 2014-02-20 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |
|
| | | * | | | | | | | | | | | | | | | | | | Hardening: Remove dangerous characters + Subdirectory Check | Lukas Reschke | 2014-02-19 | 1 | -2/+2 |
| | * | | | | | | | | | | | | | | | | | | | Merge pull request #7255 from owncloud/fix-admin-remote | Lukas Reschke | 2014-02-20 | 1 | -6/+21 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | |_|_|_|_|_|_|_|_|/ / / / / / / / / /
| |/| | | | | | | | | | | | | | | | | | |
|
| | | * | | | | | | | | | | | | | | | | | | Check whether the app is set | Lukas Reschke | 2014-02-18 | 1 | -1/+4 |
