summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Allow apps to add/modify config js output via hook.ringmaster2014-02-201-3/+6
* Merge pull request #7291 from owncloud/adminess-raghuLukas Reschke2014-02-205-26/+3
|\
| * Fix typoLukas Reschke2014-02-201-1/+1
| * Variable value is expected and not an echoed outputLukas Reschke2014-02-201-1/+1
| * Move oc_isadmin to the config JS scriptLukas Reschke2014-02-203-2/+2
| * Move isadmin to template and rename it to oc_isadminLukas Reschke2014-02-196-27/+4
* | Merge pull request #7332 from owncloud/IE10-viewportMorris Jobke2014-02-201-0/+5
|\ \
| * | fix IE10 viewport sizeingRobin Appelman2014-02-201-0/+5
|/ /
* | Merge pull request #6962 from owncloud/quota-space-rootThomas Müller2014-02-204-6/+31
|\ \
| * \ Merge branch 'master' into quota-space-rootRobin Appelman2014-02-1020-35/+68
| |\ \
| * \ \ Merge branch 'master' into quota-space-rootRobin Appelman2014-02-0798-733/+2170
| |\ \ \
| * | | | Don't create new thumbnails on the write hookRobin Appelman2014-02-041-1/+1
| * | | | Add unit test for quote wrapper size rootRobin Appelman2014-02-041-3/+22
| * | | | Actually rename the variableRobin Appelman2014-01-271-2/+2
| * | | | Fix phpdocRobin Appelman2014-01-271-1/+1
| * | | | Allow passing a root folder to get the used space from in the quota wrapperRobin Appelman2014-01-272-2/+8
* | | | | Merge pull request #7056 from owncloud/users-scrollperformanceJan-Christoph Borchardt2014-02-203-25/+76
|\ \ \ \ \
| * | | | | Added loading spinner to users list on scrollVincent Petry2014-02-181-0/+4
| * | | | | Improve users list scrolling performanceVincent Petry2014-02-173-25/+72
* | | | | | Merge pull request #6808 from globalpointfamily/remove_ie9_navagation_width_fixJan-Christoph Borchardt2014-02-201-5/+0
|\ \ \ \ \ \
| * | | | | | remove fix for IE9 nav bar widthKonstantin.Popov2014-01-171-5/+0
* | | | | | | Merge pull request #7290 from owncloud/issue/5463icewind19912014-02-201-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Correctly redirect to settings page when not selecting cert file for uploadJoas Schilling2014-02-191-1/+1
* | | | | | | | Merge pull request #7205 from owncloud/fix_7153blizzz2014-02-201-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | LDAP: prevent other configuration from being deleted when deleting the first ...Arthur Schiwon2014-02-141-0/+6
* | | | | | | | | Merge pull request #7319 from owncloud/remote-unneeded-ifMorris Jobke2014-02-201-5/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove no longer needed if statementRobin Appelman2014-02-201-5/+1
* | | | | | | | | | Merge pull request #6999 from kofemann/mount-configLukas Reschke2014-02-203-9/+10
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mount: make location of mount.json configurableTigran Mkrtchyan2014-01-293-9/+10
* | | | | | | | | | | Merge pull request #6935 from owncloud/fix_urlGeneratorBjörn Schießle2014-02-201-1/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Test if $url is already prefixed by '/'Thomas Tanghus2014-02-071-1/+2
| * | | | | | | | | | | Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840Thomas Tanghus2014-01-241-1/+1
* | | | | | | | | | | | Merge pull request #7289 from owncloud/fix-filetype-iconsLukas Reschke2014-02-208-65/+106
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | merge masterJan-Christoph Borchardt2014-02-20184-2983/+1340
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | fix filetype icons for gzip, tex, perl, csv, shJan-Christoph Borchardt2014-02-202-1/+8
| * | | | | | | | | | | | Optimize imageskondou2014-02-196-122/+108
| * | | | | | | | | | | | coding style: spaces around =>Jan-Christoph Borchardt2014-02-191-66/+66
| * | | | | | | | | | | | fix lots of file type icons for archives, js, flash, ics, fonts, code, ...Jan-Christoph Borchardt2014-02-198-2/+36
* | | | | | | | | | | | | Merge pull request #7315 from owncloud/Jakobud-core-css-logosJan-Christoph Borchardt2014-02-203-3/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'core-css-logos' of github.com:Jakobud/owncloud-coreJörn Friedrich Dreyer2014-02-203-3/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Moved Core Theme Logos to CSSJake Wilson2013-10-103-3/+17
* | | | | | | | | | | | | | | Merge pull request #7036 from LeBlaaanc/patch-1Thomas Müller2014-02-201-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Removed '/'. Fixes #7035.Chris LeBlanc2014-02-011-1/+1
* | | | | | | | | | | | | | | | Merge pull request #6519 from nhirokinet/masterLukas Reschke2014-02-202-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Update user.php to fix duplicate session-duplicatenhirokinet2013-12-221-1/+0
| * | | | | | | | | | | | | | | Security Update: session fixationNARUKAWA Hiroki2013-12-201-0/+1
* | | | | | | | | | | | | | | | Merge pull request #7301 from owncloud/fix-fuckupicewind19912014-02-201-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | fix master - #7274 brokes itMorris Jobke2014-02-201-0/+1
* | | | | | | | | | | | | | | | | Merge pull request #7247 from owncloud/sharing_cleanup_step1Björn Schießle2014-02-202-99/+173
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | clean up the sharing ajax calls, add mail notification classBjoern Schiessle2014-02-192-99/+173