summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [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 mode
| * Fixed zip download button for unlimited filesize in public modeVincent Petry2013-10-171-1/+2
| | | | | | | | | | | | Added missing condition to check whenever allowed zip size is unlimited. Fixes #3717
* | Merge pull request #5392 from owncloud/update-3rdparty-submoduleMorris Jobke2013-10-171-0/+0
|\ \ | | | | | | update 3rdparty submodule
| * | 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.
| * | 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
|\ \ | | | | | | only call shell_exec if enabled
| * | 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
|\ \ | |/ |/| Fixed sharing status update for new/uploaded files
| * Added missing var in share.jsVincent Petry2013-10-171-0/+1
| |
| * Fixed sharing status update for new/uploaded filesVincent Petry2013-10-175-46/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating new files, folders or uploading files now have their sharing icon updated accordingly. For this, the global share status list that is cached in OC.Share.statuses is reused for new files. Performance should improve as the sharing list is now only loaded once per navigation session. In OC.Share, split loadIcons into loadIcons + updateIcons. Fixes #4977
* | Merge pull request #5385 from owncloud/generate-sql-migration-masterMorris Jobke2013-10-173-1/+68
|\ \ | | | | | | new console command to generate sql migration scripts
| * | 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"
| * | 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 upload
| * | Fixed upload permissions distinction between public and logged in uploadVincent Petry2013-10-171-2/+7
| | | | | | | | | | | | Fixes #5370
* | | Merge pull request #5376 from owncloud/fix-title-ownCloudRaghu Nayyar2013-10-171-3/+4
|\ \ \ | | | | | | | | Updates ownCloud title to Application - ownCloud
| * | | 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
|\ \ \ | |_|/ |/| | PHP Code Coverage on windows master
| * | 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 ↵Thomas Müller2013-10-152-0/+355
| | | | | | | | | | | | properly
| * | 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 ↵Thomas Müller2013-10-091-1/+1
| | | | | | | | | | | | | | | | executed
* | | | Merge pull request #4949 from owncloud/improve_unknown_preview_backendFrank Karlitschek2013-10-172-5/+33
|\ \ \ \ | | | | | | | | | | use svg to generate filetype icon if imagick available
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | WebDAV depth infinity support - the dirty way
| * | | | | adding :Thomas Müller2013-09-301-1/+1
| | | | | |
| * | | | | Merge branch 'webdav-depth-fix-master' of github.com:owncloud/core into ↵Thomas Müller2013-09-300-0/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | webdav-depth-fix-master
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling of depth infinity The clean way would have been to submit proper patches to the upstream project and reincorporate the code once released. This will and has to follow!
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | handling of depth infinity The clean way would have been to submit proper patches to the upstream project and reincorporate the code once released. This will and has to follow!
* | | | | | | Merge pull request #5375 from owncloud/fix-api-documentationThomas Müller2013-10-1712-167/+166
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Public API documentation fixes
| * | | | | | Public API documentation fixesMorris Jobke2013-10-1712-167/+166
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | refs #4883 * http/response.php * config.php * response.php * files.php * idbconnection.php * app.php * user.php * template.php * share.php * db.php * icache.php & il10n.php
* | | | | | Merge pull request #5276 from owncloud/fixing-5170-masterMorris Jobke2013-10-161-23/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | only text/plain is now used to generate text previews
| * | | | | | accept text/markdown as wellThomas Müller2013-10-161-1/+1
| | | | | | |