summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 it
| | * 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 class
| | * | 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 extra checks for invalid file chars in newfile.php and newfolder.php
| | * | | Added file name check in webdav connectorVincent Petry2014-02-185-4/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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.phpVincent Petry2014-02-186-6/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
| * | | | Merge pull request #7287 from owncloud/subdirectory-hardenLukas Reschke2014-02-201-2/+2
| |\ \ \ \ | | | | | | | | | | | | Hardening: Remove dangerous characters + Subdirectory Check
| | * | | | Hardening: Remove dangerous characters + Subdirectory CheckLukas Reschke2014-02-191-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 #7255 from owncloud/fix-admin-remoteLukas Reschke2014-02-201-6/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | An admin should not be able to add remote and public services on its own
| | * | | | | 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. ↵Lukas Reschke2014-02-181-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should only be possible programmatically. This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.
| * | | | | | Merge pull request #7295 from owncloud/optimize_images_kondouMorris Jobke2014-02-20174-2969/+1125
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Optimize images
| | * | | | | | Optimize some imageskondou2014-02-19174-2969/+1125
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | and strip metadata from png images with optipng in image_optimization.sh
| * | | | | | Revert "Added extra checks for ext storage class"Vincent Petry2014-02-202-31/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9e9a5b9ea1f9b4699cf2d0c621f3f911f3639df9. Unit tests weren't ready, need further tweaking.
| * | | | | | Merge pull request #7284 from owncloud/ldap_filter_compilationLukas Reschke2014-02-202-0/+14
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | LDAP: improve compilation of filters
| | * | | | | | 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 class
| | * | | | | | 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 encoding
| | * | | | | Fixed ext storage webdav path encodingVincent Petry2014-02-194-17/+74
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Some WebDAV servers like lighttpd need paths in URLs to be properly encoded - Added error log output when curl connection failed - Added check for 'resourcetype' in case the WebDAV server doesn't support/return it - Fixed touch() to return false if the server doesn't implement PROPPATCH - Added optional delay in WebDAV unit tests to use when testing against lighttpd's WebDAV
| * | | | | Merge pull request #7195 from owncloud/files-selectallVincent Petry2014-02-1910-119/+235
| |\ \ \ \ \ | | |/ / / / | |/| | | | Do not send file list for select all on Download/delete
| | * | | | Trashbin select all now doesn't send file listVincent Petry2014-02-173-79/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed "delete" and "restore" actions to not send the file list when all files are selected - When some files are selected, sends the current dir - Removed "dirListing" attribute as the backend is able to compute the value based on the current dir
| | * | | | Do not send file list for select all on Download/deleteVincent Petry2014-02-137-40/+126
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 #7275 from owncloud/3rdparty-fixThomas Müller2014-02-191-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | fix 3rdparty submodule
| | * | | | | 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 event
| | * | | | | | Add event parameter to keyup eventJoas Schilling2014-02-191-1/+1
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | Fix issue #7277
| * | | | | | Merge pull request #4799 from ↵Jan-Christoph Borchardt2014-02-191-11/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/tune_legacy_cache_webdav_properties_prefixing_master Concatenate string in SQL instead of PHP
| | * | | | | | cleanup and actually execute the queryJörn Friedrich Dreyer2013-11-011-4/+8
| | | | | | | |
| | * | | | | | use doctrine to construct concat expressionJörn Friedrich Dreyer2013-11-011-8/+1
| | | | | | | |
| | * | | | | | Concatenate string in SQL instead of PHPJörn Friedrich Dreyer2013-11-011-10/+10
| | | | | | | |
| * | | | | | | Merge pull request #7274 from owncloud/scrutinizer-patch-1Morris Jobke2014-02-19101-97/+261
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Scrutinizer Auto-Fixes
| | * | | | | | | fix wrong removesMorris Jobke2014-02-191-1/+24
| | | | | | | | |
| | * | | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-19101-119/+260
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-policyicewind19912014-02-193-14/+91
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | Allow setting the frequency of which the file watcher checks for updates
| | * | | | | | | add unit tests for watcher policiesRobin Appelman2014-02-191-1/+55
| | | | | | | | |
| | * | | | | | | Allow setting the frequency of which the file watcher checks for updatesRobin Appelman2014-02-182-13/+36
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | integrate assetic for asset pipeline-ingThomas Müller2014-02-202-25/+91
| | | | | | | |
* | | | | | | | enable static delivery of css filesThomas Müller2014-02-201-1/+1
| | | | | | | |
* | | | | | | | reference 3rdparty branch add-asseticThomas Müller2014-02-201-0/+0
| | | | | | | |
* | | | | | | | kill references to core.js and core.cssThomas Müller2014-02-202-17/+0
| | | | | | | |
* | | | | | | | kill old minimizer codeThomas Müller2014-02-206-149/+4
| | | | | | | |
* | | | | | | | fixing js syntax errorThomas Müller2014-02-201-3/+3
|/ / / / / / /