summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Move OC_Connector_Sabre_Server to expected location.Andreas Fischer2013-10-171-0/+0
* Merge pull request #5385 from owncloud/generate-sql-migration-masterMorris Jobke2013-10-173-1/+68
|\
| * new console command to generate sql migration scriptsThomas Müller2013-10-173-1/+68
* | Merge pull request #5379 from owncloud/undefined-shippedFrank Karlitschek2013-10-171-5/+5
|\ \
| * | fix undefined "shipped"Morris Jobke2013-10-171-5/+5
* | | Merge pull request #5378 from owncloud/files-permissionsafteruploadfixMorris Jobke2013-10-171-2/+7
|\ \ \ | |_|/ |/| |
| * | Fixed upload permissions distinction between public and logged in uploadVincent Petry2013-10-171-2/+7
* | | Merge pull request #5376 from owncloud/fix-title-ownCloudRaghu Nayyar2013-10-171-3/+4
|\ \ \
| * | | Updates ownCloud title to Application - ownCloudraghunayyar2013-10-171-3/+4
| |/ /
* | | Merge pull request #5237 from owncloud/coverage-on-windows-masterThomas Müller2013-10-177-460/+483
|\ \ \ | |_|/ |/| |
| * | fixing syntax for openssl configThomas Müller2013-10-151-1/+1
| * | on windows we supply an openssl.cnf file in order to execute the unit tests p...Thomas Müller2013-10-152-0/+355
| * | any preview requiring the which command will not be used on WindowsThomas Müller2013-10-153-111/+126
| * | Merge branch 'master' into coverage-on-windows-masterThomas Müller2013-10-15844-18915/+16909
| |\ \
| * | | disable echo offThomas Müller2013-10-091-1/+1
| * | | adding missing call to make it work properlyThomas Müller2013-10-091-1/+1
| * | | win32-phpunit.php is no longer requiredThomas Müller2013-10-091-347/+0
| * | | using phpunit command in order to get the arguments for coverage properly exe...Thomas Müller2013-10-091-1/+1
* | | | Merge pull request #4949 from owncloud/improve_unknown_preview_backendFrank Karlitschek2013-10-172-5/+33
|\ \ \ \
| * | | | resize svg without loosing qualityThomas Müller2013-10-111-0/+8
| * | | | fix indentationMorris Jobke2013-10-071-6/+6
| * | | | fix wrong variable nameGeorg Ehrke2013-10-071-1/+1
| * | | | fix doc block of OC\Preview\Provider::getThumbnail()Georg Ehrke2013-10-071-3/+9
| * | | | check if svg of filetype icon existsGeorg Ehrke2013-10-071-2/+2
| * | | | use readImage instead of readImageBlobGeorg Ehrke2013-10-071-2/+1
| * | | | fix new extensionGeorg Ehrke2013-10-071-2/+2
| * | | | use svg to generate filetype icon if imagick availableGeorg Ehrke2013-10-071-1/+16
* | | | | Merge pull request #4935 from owncloud/webdav-depth-fix-masterFrank Karlitschek2013-10-172-1/+236
|\ \ \ \ \
| * | | | | adding :Thomas Müller2013-09-301-1/+1
| * | | | | Merge branch 'webdav-depth-fix-master' of github.com:owncloud/core into webda...Thomas Müller2013-09-300-0/+0
| |\ \ \ \ \
| | * | | | | adding copyright and PHPDocsThomas Müller2013-09-231-8/+22
| | * | | | | Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the ...Thomas Müller2013-09-202-1/+222
| * | | | | | adding copyright and PHPDocsThomas Müller2013-09-301-8/+22
| * | | | | | Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the ...Thomas Müller2013-09-302-1/+222
* | | | | | | Merge pull request #5375 from owncloud/fix-api-documentationThomas Müller2013-10-1712-167/+166
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Public API documentation fixesMorris Jobke2013-10-1712-167/+166
|/ / / / / /
* | | | | | Merge pull request #5276 from owncloud/fixing-5170-masterMorris Jobke2013-10-161-23/+12
|\ \ \ \ \ \
| * | | | | | accept text/markdown as wellThomas Müller2013-10-161-1/+1
| * | | | | | Merge branch 'master' into fixing-5170-masterThomas Müller2013-10-16969-21161/+19536
| |\ \ \ \ \ \
| * | | | | | | implement previews for markdownGeorg Ehrke2013-10-141-0/+10
| * | | | | | | remove php and js previewsGeorg Ehrke2013-10-111-20/+0
| * | | | | | | only text/plain is now used to generate text previewsThomas Müller2013-10-111-11/+10
* | | | | | | | Merge pull request #5262 from owncloud/files-ie8-conflictdialogbrokenfixMorris Jobke2013-10-162-2/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed conflict dialog in IE8Vincent Petry2013-10-102-2/+6
* | | | | | | | | Merge pull request #5157 from owncloud/fixing-appframework-masterThomas Müller2013-10-1624-466/+216
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | re-enable test in SecurityMiddlewareTestThomas Müller2013-10-161-5/+0
| * | | | | | | | | Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-161013-21948/+20262
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #5067 from owncloud/urlParams_fixThomas Müller2013-10-166-19/+27
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Get urlParams registered before Request is instantiatedThomas Tanghus2013-10-016-19/+27
* | | | | | | | | | Merge pull request #5353 from owncloud/files-dndtodirbrokenMorris Jobke2013-10-161-14/+22
|\ \ \ \ \ \ \ \ \ \