summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | | | | | | | kill $coreStyles and $coreScriptsThomas Müller2014-02-203-17/+0
* | | | | | | | | | | | | | | | | revert wrong change to .htaccessThomas Müller2014-02-201-0/+1
* | | | | | | | | | | | | | | | | remove unused functions - have been introduced with the old minimizer approachThomas Müller2014-02-201-27/+0
* | | | | | | | | | | | | | | | | IndentationLukas Reschke2014-02-201-2/+2
* | | | | | | | | | | | | | | | | Merge branch 'master' into no-css-js-delivery-via-phpThomas Müller2014-02-20304-3344/+2174
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | | | | | | | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfixLukas Reschke2014-02-2011-10/+169
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | Added file name check in webdav connectorVincent Petry2014-02-185-4/+76
| | * | | | | | | | | | | | | | | | | | Added extra checks for invalid file chars in newfile.php and newfolder.phpVincent Petry2014-02-186-6/+93
| * | | | | | | | | | | | | | | | | | | Merge pull request #7287 from owncloud/subdirectory-hardenLukas Reschke2014-02-201-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Hardening: Remove dangerous characters + Subdirectory CheckLukas Reschke2014-02-191-2/+2
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #7255 from owncloud/fix-admin-remoteLukas Reschke2014-02-201-6/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Check whether the app is setLukas Reschke2014-02-181-1/+4
| | * | | | | | | | | | | | | | | | | | Check whether the Key is setLukas Reschke2014-02-181-1/+1
| | * | | | | | | | | | | | | | | | | | An admin should not be able to add remote and public services on its own. Thi...Lukas Reschke2014-02-181-6/+18
| * | | | | | | | | | | | | | | | | | | Merge pull request #7295 from owncloud/optimize_images_kondouMorris Jobke2014-02-20174-2969/+1125
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | Optimize some imageskondou2014-02-19174-2969/+1125
| | | |/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Revert "Added extra checks for ext storage class"Vincent Petry2014-02-202-31/+1
| * | | | | | | | | | | | | | | | | | | Merge pull request #7284 from owncloud/ldap_filter_compilationLukas Reschke2014-02-202-0/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | LDAP: improve compilation of filtersArthur Schiwon2014-02-192-0/+14
| | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge pull request #7294 from owncloud/extstorage-configclassLukas Reschke2014-02-202-1/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | Added extra checks for ext storage classVincent Petry2014-02-192-1/+31
| | | |/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge pull request #7027 from owncloud/extstorage-webdavurlencodingfixesLukas Reschke2014-02-194-17/+74
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Fixed ext storage webdav path encodingVincent Petry2014-02-194-17/+74
| |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge pull request #7195 from owncloud/files-selectallVincent Petry2014-02-1910-119/+235
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | Trashbin select all now doesn't send file listVincent Petry2014-02-173-79/+109
| | * | | | | | | | | | | | | | | | Do not send file list for select all on Download/deleteVincent Petry2014-02-137-40/+126
| * | | | | | | | | | | | | | | | | Merge pull request #7275 from owncloud/3rdparty-fixThomas Müller2014-02-191-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | fix 3rdparty submoduleMorris Jobke2014-02-191-0/+0
| | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge pull request #7278 from owncloud/issue/7277Jan-Christoph Borchardt2014-02-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | Add event parameter to keyup eventJoas Schilling2014-02-191-1/+1
| | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_pr...Jan-Christoph Borchardt2014-02-191-11/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | cleanup and actually execute the queryJörn Friedrich Dreyer2013-11-011-4/+8