Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | dispayNamesInGroup(s) should always return uid as key in the result attr, ↵ | Arthur Schiwon | 2013-10-20 | 1 | -1/+1 |
| | | | | fixes #5209 | ||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-10-19 | 3 | -4/+25 |
| | |||||
* | the logfile shoudn't be world readable. | Frank Karlitschek | 2013-10-18 | 1 | -0/+1 |
| | |||||
* | Merge pull request #3219 from owncloud/disabled-links-ui | Frank Karlitschek | 2013-10-18 | 2 | -0/+22 |
|\ | | | | | Disabled links UI fixes | ||||
| * | Remove "link" shares right after disabling the "allow_link_share" setting | Morris Jobke | 2013-10-18 | 2 | -0/+18 |
| | | |||||
| * | Don't return links for shared files if disabled | Michael Gapczynski | 2013-10-18 | 1 | -0/+4 |
| | | |||||
* | | Use display name from magic cookie, fixes #4884 | Arthur Schiwon | 2013-10-18 | 1 | -0/+1 |
|/ | |||||
* | Merge pull request #5395 from owncloud/more_check_options | Vincent Petry | 2013-10-18 | 1 | -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 Karlitschek | 2013-10-17 | 1 | -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-ocdavclientwithtimeout | Vincent Petry | 2013-10-18 | 2 | -1/+49 |
|\ \ | | | | | | | Added timeout for WebDAV post setup check | ||||
| * | | Fixed spaces | Vincent Petry | 2013-10-17 | 1 | -3/+3 |
| | | | |||||
| * | | Added timeout value to WebDAV post setup check | Vincent Petry | 2013-10-16 | 1 | -1/+3 |
| | | | | | | | | | | | | Fixes #5357 | ||||
| * | | Added DAV client wrapper that support timeout values | Vincent Petry | 2013-10-16 | 1 | -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 transifex | Jenkins for ownCloud | 2013-10-17 | 22 | -26/+4 |
| |/ |/| | |||||
* | | 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 |
| | | | | | | | | |