aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #5382 from owncloud/sharing_api_include_resharesBjörn Schießle2013-10-172-27/+145
|\
| * split up reset()['path'] to make it compatible with older PHP versionsBjoern Schiessle2013-10-171-1/+2
| * add test for the reshare optionBjoern Schiessle2013-10-171-2/+59
| * adjust testsBjoern Schiessle2013-10-172-4/+3
| * new option to add reshares to the resultBjoern Schiessle2013-10-171-24/+85
* | [tx-robot] updated from transifexJenkins for ownCloud2013-10-17140-2722/+2503
* | Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszeroMorris Jobke2013-10-171-1/+2
|\ \
| * | Fixed zip download button for unlimited filesize in public modeVincent Petry2013-10-171-1/+2
* | | Merge pull request #5392 from owncloud/update-3rdparty-submoduleMorris Jobke2013-10-171-0/+0
|\ \ \
| * | | update 3rdparty submoduleThomas Müller2013-10-171-0/+0
* | | | Merge pull request #5394 from owncloud/sabre-server-locationThomas Müller2013-10-171-0/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Move OC_Connector_Sabre_Server to expected location.Andreas Fischer2013-10-171-0/+0
| |/ /
* | | Merge pull request #5389 from owncloud/fix_shell_execMorris Jobke2013-10-172-4/+4
|\ \ \
| * | | fix commentGeorg Ehrke2013-10-171-1/+1
| * | | only call shell_exec if enabledGeorg Ehrke2013-10-172-3/+3
| |/ /
* | | Merge pull request #5381 from owncloud/files-sharingstateafteruploadMorris Jobke2013-10-175-46/+83
|\ \ \ | |/ / |/| |
| * | Added missing var in share.jsVincent Petry2013-10-171-0/+1
| * | Fixed sharing status update for new/uploaded filesVincent Petry2013-10-175-46/+82
* | | 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