summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* dispayNamesInGroup(s) should always return uid as key in the result attr, ↵Arthur Schiwon2013-10-201-1/+1
| | | | fixes #5209
* [tx-robot] updated from transifexJenkins for ownCloud2013-10-193-4/+25
|
* the logfile shoudn't be world readable.Frank Karlitschek2013-10-181-0/+1
|
* Merge pull request #3219 from owncloud/disabled-links-uiFrank Karlitschek2013-10-182-0/+22
|\ | | | | Disabled links UI fixes
| * Remove "link" shares right after disabling the "allow_link_share" settingMorris Jobke2013-10-182-0/+18
| |
| * Don't return links for shared files if disabledMichael Gapczynski2013-10-181-0/+4
| |
* | Use display name from magic cookie, fixes #4884Arthur Schiwon2013-10-181-0/+1
|/
* Merge pull request #5395 from owncloud/more_check_optionsVincent Petry2013-10-181-0/+7
|\ | | | | add options to disable the check for a working .htaccess file in data
| * add options to disable the check for a working .htaccess file in data and ↵Frank Karlitschek2013-10-171-0/+7
| | | | | | | | for a working WebDAV server. This are advanced settings that are needed in special situations where our check fail and the user runs into an http timeout.
* | Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeoutVincent Petry2013-10-182-1/+49
|\ \ | | | | | | Added timeout for WebDAV post setup check
| * | Fixed spacesVincent Petry2013-10-171-3/+3
| | |
| * | Added timeout value to WebDAV post setup checkVincent Petry2013-10-161-1/+3
| | | | | | | | | | | | Fixes #5357
| * | Added DAV client wrapper that support timeout valuesVincent Petry2013-10-161-0/+46
| | | | | | | | | | | | | | | | | | Since SabreDAV does not support passing a timeout value to curl, this commit adds a subclass for it that will set the timeout value to curlRequest().
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-10-1722-26/+4
| |/ |/|
* | 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
| | | | | | | | |