summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | fix commentGeorg Ehrke2013-10-171-1/+1
| |
* | only call shell_exec if enabledGeorg Ehrke2013-10-172-3/+3
|/
* Merge pull request #5385 from owncloud/generate-sql-migration-masterMorris Jobke2013-10-171-1/+21
|\ | | | | new console command to generate sql migration scripts
| * new console command to generate sql migration scriptsThomas Müller2013-10-171-1/+21
| |
* | 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 #5237 from owncloud/coverage-on-windows-masterThomas Müller2013-10-173-111/+126
|\ \ | |/ |/| PHP Code Coverage on windows master
| * any preview requiring the which command will not be used on WindowsThomas Müller2013-10-153-111/+126
| |
* | 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-171-0/+235
|\ \ \ | | | | | | | | WebDAV depth infinity support - the dirty way
| * | | adding :Thomas Müller2013-09-301-1/+1
| | | |
| * | | 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-301-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 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
| | | | |
| * | | | Merge branch 'master' into fixing-5170-masterThomas Müller2013-10-1621-40/+229
| |\ \ \ \
| * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | blacklist implementation remove because no longer needed
* | | | | | Merge branch 'master' into fixing-appframework-masterThomas Müller2013-10-1631-383/+321
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appframework/middleware/security/securitymiddleware.php tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
| * \ \ \ \ \ Merge pull request #5067 from owncloud/urlParams_fixThomas Müller2013-10-164-16/+17
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Get urlParams registered before Request is instantiated
| | * | | | | Get urlParams registered before Request is instantiatedThomas Tanghus2013-10-014-16/+17
| | | | | | |
| * | | | | | Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backendThomas Müller2013-10-161-5/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | file system is now initialized with apache authentication as well
| | * | | | | | there shall be tabsThomas Müller2013-10-141-1/+1
| | | | | | | |
| | * | | | | | file system is now initialized with apache authentication as wellThomas Müller2013-10-141-6/+2
| | | | | | | |
| * | | | | | | Merge pull request #5333 from owncloud/avater_with_encryptionBjörn Schießle2013-10-161-4/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | avatars should also work with encryption after pr #5332 was merged
| | * \ \ \ \ \ \ Merge branch 'master' into avater_with_encryptionBjoern Schiessle2013-10-156-22/+78
| | |\ \ \ \ \ \ \
| | * | | | | | | | avatars should also work with encryption after pr #5332 was mergedBjoern Schiessle2013-10-141-4/+0
| | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Prevent renaming/deleting mount pointsVincent Petry2013-10-151-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-htmlVincent Petry2013-10-151-1/+1
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | Fix logout link HTML.
| | * | | | | | Fix logout link HTML.Andreas Fischer2013-10-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | <a id="logout" href=/projects/owncloud/core/index.php?logout=true>
| * | | | | | | streamCopy() should return proper structure.Thomas Müller2013-10-141-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Callers of streamCopy() expect an array to be returned containing count and result.
| * | | | | | Merge pull request #4867 from owncloud/fixing-4546-masterThomas Müller2013-10-144-19/+75
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | Adding detection of aborted uploads for chunked uploads
| | * | | | | Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-1426-349/+202
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/connector/sabre/file.php
| | * | | | | | moving createFileChunked() to OC_Connector_Sabre_FileThomas Müller2013-10-071-15/+34
| | | | | | | |
| | * | | | | | Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-07313-1338/+6557
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/connector/sabre/directory.php
| | * \ \ \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-09-302-13/+101
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php
| | * \ \ \ \ \ \ \ Merge branch 'master' into fixing-4546-masterThomas Müller2013-09-3044-167/+606
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/connector/sabre/directory.php
| | * | | | | | | | | adding detection of aborted uploadsThomas Müller2013-09-161-41/+58
| | | | | | | | | | |