Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | 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 #5385 from owncloud/generate-sql-migration-master | Morris Jobke | 2013-10-17 | 1 | -1/+21 |
|\ | | | | | new console command to generate sql migration scripts | ||||
| * | new console command to generate sql migration scripts | Thomas Müller | 2013-10-17 | 1 | -1/+21 |
| | | |||||
* | | 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 #5237 from owncloud/coverage-on-windows-master | Thomas Müller | 2013-10-17 | 3 | -111/+126 |
|\ \ | |/ |/| | PHP Code Coverage on windows master | ||||
| * | any preview requiring the which command will not be used on Windows | Thomas Müller | 2013-10-15 | 3 | -111/+126 |
| | | |||||
* | | 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 | 1 | -0/+235 |
|\ \ \ | | | | | | | | | WebDAV depth infinity support - the dirty way | ||||
| * | | | adding : | Thomas Müller | 2013-09-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | 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 | 1 | -0/+221 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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! | ||||
* | | | | 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 |
| | | | | | |||||
| * | | | | Merge branch 'master' into fixing-5170-master | Thomas Müller | 2013-10-16 | 21 | -40/+229 |
| |\ \ \ \ | |||||
| * | | | | | implement previews for markdown | Georg Ehrke | 2013-10-14 | 1 | -0/+10 |
| | | | | | | |||||
| * | | | | | remove php and js previews | Georg Ehrke | 2013-10-11 | 1 | -20/+0 |
| | | | | | | |||||
| * | | | | | only text/plain is now used to generate text previews | Thomas Müller | 2013-10-11 | 1 | -11/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | blacklist implementation remove because no longer needed | ||||
* | | | | | | Merge branch 'master' into fixing-appframework-master | Thomas Müller | 2013-10-16 | 31 | -383/+321 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appframework/middleware/security/securitymiddleware.php tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php | ||||
| * \ \ \ \ \ | Merge pull request #5067 from owncloud/urlParams_fix | Thomas Müller | 2013-10-16 | 4 | -16/+17 |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Get urlParams registered before Request is instantiated | ||||
| | * | | | | | Get urlParams registered before Request is instantiated | Thomas Tanghus | 2013-10-01 | 4 | -16/+17 |
| | | | | | | | |||||
| * | | | | | | Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend | Thomas Müller | 2013-10-16 | 1 | -5/+1 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | file system is now initialized with apache authentication as well | ||||
| | * | | | | | | there shall be tabs | Thomas Müller | 2013-10-14 | 1 | -1/+1 |
| | | | | | | | | |||||
| | * | | | | | | file system is now initialized with apache authentication as well | Thomas Müller | 2013-10-14 | 1 | -6/+2 |
| | | | | | | | | |||||
| * | | | | | | | Merge pull request #5333 from owncloud/avater_with_encryption | Björn Schießle | 2013-10-16 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | avatars should also work with encryption after pr #5332 was merged | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into avater_with_encryption | Bjoern Schiessle | 2013-10-15 | 6 | -22/+78 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | avatars should also work with encryption after pr #5332 was merged | Bjoern Schiessle | 2013-10-14 | 1 | -4/+0 |
| | | |/ / / / / / | | |/| | | | | | | |||||
| * | | | | | | | | Prevent renaming/deleting mount points | Vincent Petry | 2013-10-15 | 1 | -1/+2 |
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed permissions returned for mount points to not include update and delete permissions. Fixes #5291 | ||||
| * | | | | | | | Merge pull request #5341 from owncloud/fix-logout-link-html | Vincent Petry | 2013-10-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | Fix logout link HTML. | ||||
| | * | | | | | | Fix logout link HTML. | Andreas Fischer | 2013-10-14 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <a id="logout" href=/projects/owncloud/core/index.php?logout=true> | ||||
| * | | | | | | | streamCopy() should return proper structure. | Thomas Müller | 2013-10-14 | 1 | -2/+2 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | Callers of streamCopy() expect an array to be returned containing count and result. | ||||
| * | | | | | | Merge pull request #4867 from owncloud/fixing-4546-master | Thomas Müller | 2013-10-14 | 4 | -19/+75 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | Adding detection of aborted uploads for chunked uploads | ||||
| | * | | | | | Merge branch 'master' into fixing-4546-master | Thomas Müller | 2013-10-14 | 26 | -349/+202 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/connector/sabre/file.php | ||||
| | * | | | | | | moving createFileChunked() to OC_Connector_Sabre_File | Thomas Müller | 2013-10-07 | 1 | -15/+34 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'master' into fixing-4546-master | Thomas Müller | 2013-10-07 | 313 | -1338/+6557 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/connector/sabre/directory.php | ||||
| | * \ \ \ \ \ \ | Merge branch 'master' into fixing-4546-master | Thomas Müller | 2013-09-30 | 2 | -13/+101 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php | ||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' into fixing-4546-master | Thomas Müller | 2013-09-30 | 44 | -167/+606 |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php | ||||
| | * | | | | | | | | | adding detection of aborted uploads | Thomas Müller | 2013-09-16 | 1 | -41/+58 |
| | | | | | | | | | | |