| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #5455 from owncloud/fixing-2423-master | Thomas Müller | 2013-10-22 | 6 | -11/+28 |
| |\ | | | | | introduce link_to_docs() and migrate links | ||||
| | * | use OC_Helper::linkToDocs() in lib/private/config.php | Thomas Müller | 2013-10-21 | 1 | -1/+1 |
| | | | |||||
| | * | introduce OC_Helper::linkToDocs() | Thomas Müller | 2013-10-21 | 3 | -6/+18 |
| | | | |||||
| | * | introduce link_to_docs() and migrate links | Thomas Müller | 2013-10-21 | 5 | -11/+16 |
| | | | |||||
| * | | Merge pull request #5437 from owncloud/create-custom-logfile | Thomas Müller | 2013-10-22 | 1 | -1/+11 |
| |\ \ | | | | | | | Try to create custom log file before falling back to default. | ||||
| | * | | Try to create custom log file before falling back to default. | Andreas Fischer | 2013-10-20 | 1 | -1/+11 |
| | | | | |||||
| * | | | Merge pull request #5249 from owncloud/activities-api | Thomas Müller | 2013-10-21 | 6 | -0/+184 |
| |\ \ \ | | | | | | | | | [OC6] Activities api | ||||
| | * \ \ | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-16 | 18 | -313/+139 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/server.php | ||||
| | * | | | | remove test code | Thomas Müller | 2013-10-16 | 1 | -4/+0 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-16 | 26 | -362/+253 |
| | |\ \ \ \ | |||||
| | * | | | | | adding OC6 public API for activities | Thomas Müller | 2013-10-09 | 3 | -5/+44 |
| | | | | | | | |||||
| | * | | | | | Merge branch 'master' into activities-api | Thomas Müller | 2013-10-09 | 292 | -493/+1411 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | initial implementation of activity manager | Thomas Müller | 2013-09-29 | 4 | -0/+73 |
| | | | | | | | | |||||
| | * | | | | | | Merge branch 'appframework-master' into activities-api | Thomas Müller | 2013-09-29 | 58 | -1355/+2057 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/public/iservercontainer.php | ||||
| | * | | | | | | | adding basic interfaces for the activities api | Thomas Müller | 2013-09-20 | 3 | -0/+77 |
| | | | | | | | | | |||||
| * | | | | | | | | New OCS route: | Thomas Müller | 2013-10-21 | 1 | -2/+11 |
| | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | /ocs/cloud/user Response: <?xml version="1.0"?> <ocs> <meta> <status>ok</status> <statuscode>100</statuscode> <message/> </meta> <data> <id>thomas</id> <display-name>DeepDiver</display-name> <email>no-response@domain.tld</email> </data> </ocs> | ||||
| * | | | | | | | 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 | ||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |