Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-17 | 140 | -2722/+2503 |
| | |||||
* | Merge pull request #5393 from owncloud/files-downloadzipwhenzipsizeiszero | Morris Jobke | 2013-10-17 | 1 | -1/+2 |
|\ | | | | | Fixed zip download button for unlimited filesize in public mode | ||||
| * | Fixed zip download button for unlimited filesize in public mode | Vincent Petry | 2013-10-17 | 1 | -1/+2 |
| | | | | | | | | | | | | Added missing condition to check whenever allowed zip size is unlimited. Fixes #3717 | ||||
* | | Merge pull request #5392 from owncloud/update-3rdparty-submodule | Morris Jobke | 2013-10-17 | 1 | -0/+0 |
|\ \ | | | | | | | update 3rdparty submodule | ||||
| * | | update 3rdparty submodule | Thomas Müller | 2013-10-17 | 1 | -0/+0 |
| | | | |||||
* | | | Merge pull request #5394 from owncloud/sabre-server-location | Thomas Müller | 2013-10-17 | 1 | -0/+0 |
|\ \ \ | |/ / |/| | | Move OC_Connector_Sabre_Server to expected location. | ||||
| * | | Move OC_Connector_Sabre_Server to expected location. | Andreas Fischer | 2013-10-17 | 1 | -0/+0 |
| |/ | |||||
* | | Merge pull request #5389 from owncloud/fix_shell_exec | Morris Jobke | 2013-10-17 | 2 | -4/+4 |
|\ \ | | | | | | | only call shell_exec if enabled | ||||
| * | | fix comment | Georg Ehrke | 2013-10-17 | 1 | -1/+1 |
| | | | |||||
| * | | only call shell_exec if enabled | Georg Ehrke | 2013-10-17 | 2 | -3/+3 |
| |/ | |||||
* | | Merge pull request #5381 from owncloud/files-sharingstateafterupload | Morris Jobke | 2013-10-17 | 5 | -46/+83 |
|\ \ | |/ |/| | Fixed sharing status update for new/uploaded files | ||||
| * | Added missing var in share.js | Vincent Petry | 2013-10-17 | 1 | -0/+1 |
| | | |||||
| * | Fixed sharing status update for new/uploaded files | Vincent Petry | 2013-10-17 | 5 | -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-master | Morris Jobke | 2013-10-17 | 3 | -1/+68 |
|\ \ | | | | | | | new console command to generate sql migration scripts | ||||
| * | | new console command to generate sql migration scripts | Thomas Müller | 2013-10-17 | 3 | -1/+68 |
| | | | |||||
* | | | Merge pull request #5379 from owncloud/undefined-shipped | Frank Karlitschek | 2013-10-17 | 1 | -5/+5 |
|\ \ \ | |_|/ |/| | | fix undefined "shipped" | ||||
| * | | fix undefined "shipped" | Morris Jobke | 2013-10-17 | 1 | -5/+5 |
| | | | |||||
* | | | Merge pull request #5378 from owncloud/files-permissionsafteruploadfix | Morris Jobke | 2013-10-17 | 1 | -2/+7 |
|\ \ \ | |_|/ |/| | | Fixed upload permissions distinction between public and logged in upload | ||||
| * | | Fixed upload permissions distinction between public and logged in upload | Vincent Petry | 2013-10-17 | 1 | -2/+7 |
| | | | | | | | | | | | | Fixes #5370 | ||||
* | | | Merge pull request #5376 from owncloud/fix-title-ownCloud | Raghu Nayyar | 2013-10-17 | 1 | -3/+4 |
|\ \ \ | | | | | | | | | Updates ownCloud title to Application - ownCloud | ||||
| * | | | Updates ownCloud title to Application - ownCloud | raghunayyar | 2013-10-17 | 1 | -3/+4 |
| |/ / | |||||
* | | | Merge pull request #5237 from owncloud/coverage-on-windows-master | Thomas Müller | 2013-10-17 | 7 | -460/+483 |
|\ \ \ | |_|/ |/| | | PHP Code Coverage on windows master | ||||
| * | | fixing syntax for openssl config | Thomas Müller | 2013-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | on windows we supply an openssl.cnf file in order to execute the unit tests ↵ | Thomas Müller | 2013-10-15 | 2 | -0/+355 |
| | | | | | | | | | | | | properly | ||||
| * | | any preview requiring the which command will not be used on Windows | Thomas Müller | 2013-10-15 | 3 | -111/+126 |
| | | | |||||
| * | | Merge branch 'master' into coverage-on-windows-master | Thomas Müller | 2013-10-15 | 844 | -18915/+16909 |
| |\ \ | |||||
| * | | | disable echo off | Thomas Müller | 2013-10-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | adding missing call to make it work properly | Thomas Müller | 2013-10-09 | 1 | -1/+1 |
| | | | | |||||
| * | | | win32-phpunit.php is no longer required | Thomas Müller | 2013-10-09 | 1 | -347/+0 |
| | | | | |||||
| * | | | using phpunit command in order to get the arguments for coverage properly ↵ | Thomas Müller | 2013-10-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | executed | ||||
* | | | | Merge pull request #4949 from owncloud/improve_unknown_preview_backend | Frank Karlitschek | 2013-10-17 | 2 | -5/+33 |
|\ \ \ \ | | | | | | | | | | | use svg to generate filetype icon if imagick available | ||||
| * | | | | resize svg without loosing quality | Thomas Müller | 2013-10-11 | 1 | -0/+8 |
| | | | | | |||||
| * | | | | fix indentation | Morris Jobke | 2013-10-07 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | fix wrong variable name | Georg Ehrke | 2013-10-07 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix doc block of OC\Preview\Provider::getThumbnail() | Georg Ehrke | 2013-10-07 | 1 | -3/+9 |
| | | | | | |||||
| * | | | | check if svg of filetype icon exists | Georg Ehrke | 2013-10-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | use readImage instead of readImageBlob | Georg Ehrke | 2013-10-07 | 1 | -2/+1 |
| | | | | | |||||
| * | | | | fix new extension | Georg Ehrke | 2013-10-07 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | use svg to generate filetype icon if imagick available | Georg Ehrke | 2013-10-07 | 1 | -1/+16 |
| | | | | | |||||
* | | | | | Merge pull request #4935 from owncloud/webdav-depth-fix-master | Frank Karlitschek | 2013-10-17 | 2 | -1/+236 |
|\ \ \ \ \ | | | | | | | | | | | | | WebDAV depth infinity support - the dirty way | ||||
| * | | | | | adding : | Thomas Müller | 2013-09-30 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge branch 'webdav-depth-fix-master' of github.com:owncloud/core into ↵ | Thomas Müller | 2013-09-30 | 0 | -0/+0 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | webdav-depth-fix-master | ||||
| | * | | | | | adding copyright and PHPDocs | Thomas Müller | 2013-09-23 | 1 | -8/+22 |
| | | | | | | | |||||
| | * | | | | | Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the ↵ | Thomas Müller | 2013-09-20 | 2 | -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 PHPDocs | Thomas Müller | 2013-09-30 | 1 | -8/+22 |
| | | | | | | | |||||
| * | | | | | | Contains ownCloud's own implementation of the Sabre_DAV_Server regarding the ↵ | Thomas Müller | 2013-09-30 | 2 | -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-documentation | Thomas Müller | 2013-10-17 | 12 | -167/+166 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | Public API documentation fixes | ||||
| * | | | | | | Public API documentation fixes | Morris Jobke | 2013-10-17 | 12 | -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-master | Morris Jobke | 2013-10-16 | 1 | -23/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | only text/plain is now used to generate text previews | ||||
| * | | | | | | accept text/markdown as well | Thomas Müller | 2013-10-16 | 1 | -1/+1 |
| | | | | | | |