mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,535 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

5021 Commits

Author SHA1 Message Date
Thomas Müller 064fd5ae53 Merge pull request #5451 from owncloud/reuse-session-ocs-master 
Support existing sessions within OCS API calls
 2013-10-22 14:41:21 -07:00
Thomas Müller 09903aa36c - delete properties on node delete 
- move properties on node move
 2013-10-22 19:41:26 +02:00
Thomas Müller cadd71ec8a Merge pull request #5455 from owncloud/fixing-2423-master 
introduce link_to_docs() and migrate links
 2013-10-22 01:28:43 -07:00
Thomas Müller 9d976013da Merge pull request #5437 from owncloud/create-custom-logfile 
Try to create custom log file before falling back to default.
 2013-10-22 01:17:31 -07:00
Thomas Müller 87a09156f8 use OC_Helper::linkToDocs() in lib/private/config.php 2013-10-21 23:08:09 +02:00
Thomas Müller 408e0022dd Merge pull request #5249 from owncloud/activities-api 
[OC6] Activities api
 2013-10-21 13:21:17 -07:00
Thomas Müller 124984905e introduce OC_Helper::linkToDocs() 2013-10-21 22:01:27 +02:00
Thomas Müller 148d2616e5 introduce link_to_docs() and migrate links 2013-10-21 21:29:45 +02:00
Thomas Müller 66a2f3b0b9 New OCS route: 
/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>
 2013-10-21 20:14:18 +02:00
Thomas Müller 581cd9bb9c Support existing sessions within OCS API calls 2013-10-21 18:58:46 +02:00
Andreas Fischer 5978ddbec6 Try to create custom log file before falling back to default. 2013-10-20 23:58:07 +02:00
Arthur Schiwon 701009bd72 dispayNamesInGroup(s) should always return uid as key in the result attr, fixes #5209 2013-10-20 20:55:27 +02:00
Jenkins for ownCloud 6aee83cadf [tx-robot] updated from transifex 2013-10-19 08:27:13 -04:00
Frank Karlitschek 9e99f9d13d the logfile shoudn't be world readable. 2013-10-18 17:15:02 +02:00
Frank Karlitschek 05523e7a70 Merge pull request #3219 from owncloud/disabled-links-ui 
Disabled links UI fixes
 2013-10-18 05:02:06 -07:00
Arthur Schiwon 33c4747fdf Use display name from magic cookie, fixes #4884 2013-10-18 13:36:33 +02:00
Morris Jobke 1f1fcc6129 Remove "link" shares right after disabling the "allow_link_share" setting 2013-10-18 11:37:13 +02:00
Michael Gapczynski 4cf328e3b9 Don't return links for shared files if disabled 2013-10-18 10:34:30 +02:00
Vincent Petry 5c5621d84e Merge pull request #5395 from owncloud/more_check_options 
add options to disable the check for a working .htaccess file in data
 2013-10-18 01:23:20 -07:00
Vincent Petry 11cfb9dc48 Merge pull request #5358 from owncloud/postinstall-ocdavclientwithtimeout 
Added timeout for WebDAV post setup check
 2013-10-18 01:10:04 -07:00
Vincent Petry b1f72edc57 Fixed spaces 2013-10-17 23:22:19 +02:00
Jenkins for ownCloud 2845747528 [tx-robot] updated from transifex 2013-10-17 13:48:52 -04:00
Frank Karlitschek 6a60a47d59 add options to disable the check for a working .htaccess file in data and 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. 2013-10-17 16:27:43 +02:00
Thomas Müller c3c27b3e58 Merge pull request #5394 from owncloud/sabre-server-location 
Move OC_Connector_Sabre_Server to expected location.
 2013-10-17 07:11:50 -07:00
Andreas Fischer 5ee74b656c Move OC_Connector_Sabre_Server to expected location. 2013-10-17 16:04:59 +02:00
Georg Ehrke 4c5959e1f5 fix comment 2013-10-17 15:19:15 +02:00
Georg Ehrke 521277b8b6 only call shell_exec if enabled 2013-10-17 14:31:07 +02:00
Morris Jobke 9c8d1190c0 Merge pull request #5385 from owncloud/generate-sql-migration-master 
new console command to generate sql migration scripts
 2013-10-17 04:53:18 -07:00
Frank Karlitschek d2b1a361cc Merge pull request #5379 from owncloud/undefined-shipped 
fix undefined "shipped"
 2013-10-17 04:37:40 -07:00
Thomas Müller 6e1881dbe4 new console command to generate sql migration scripts 2013-10-17 12:51:30 +02:00
Morris Jobke 793ccfd1df fix undefined "shipped" 2013-10-17 11:35:13 +02:00
Thomas Müller b70d67d49a Merge pull request #5237 from owncloud/coverage-on-windows-master 
PHP Code Coverage on windows master
 2013-10-17 02:23:15 -07:00
Frank Karlitschek 186c6a56d1 Merge pull request #4949 from owncloud/improve_unknown_preview_backend 
use svg to generate filetype icon if imagick available
 2013-10-17 01:48:34 -07:00
Frank Karlitschek d70a6c3f98 Merge pull request #4935 from owncloud/webdav-depth-fix-master 
WebDAV depth infinity support - the dirty way
 2013-10-17 01:37:38 -07:00
Morris Jobke 30f4d91d01 Public API documentation fixes 
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
 2013-10-17 00:49:15 +02:00
Morris Jobke 04783da829 Merge pull request #5276 from owncloud/fixing-5170-master 
only text/plain is now used to generate text previews
 2013-10-16 14:21:40 -07:00
Thomas Müller 221a650815 Merge branch 'master' into activities-api 
Conflicts:
	lib/private/server.php
 2013-10-16 21:15:25 +02:00
Thomas Müller fdeef5e874 Merge branch 'master' into fixing-appframework-master 
Conflicts:
	lib/private/appframework/middleware/security/securitymiddleware.php
	tests/lib/appframework/middleware/security/SecurityMiddlewareTest.php
 2013-10-16 15:45:55 +02:00
Thomas Müller c3f7d22adc Merge pull request #5067 from owncloud/urlParams_fix 
Get urlParams registered before Request is instantiated
 2013-10-16 06:42:09 -07:00
Thomas Müller 852a50aa89 remove test code 2013-10-16 15:38:56 +02:00
Thomas Müller 8c2b0b1394 Merge branch 'master' into activities-api 2013-10-16 15:36:35 +02:00
Thomas Müller aca66270c7 accept text/markdown as well 2013-10-16 15:31:43 +02:00
Thomas Müller d8a7b1e537 Merge branch 'master' into fixing-5170-master 2013-10-16 14:48:55 +02:00
Thomas Müller fa3a65aea7 Merge pull request #5325 from owncloud/setup-fs-on-apache-auth-backend 
file system is now initialized with apache authentication as well
 2013-10-16 04:23:45 -07:00
Vincent Petry 52e31405f7 Added timeout value to WebDAV post setup check 
Fixes #5357
 2013-10-16 12:34:22 +02:00
Vincent Petry 7037f9c6f8 Added DAV client wrapper that support timeout values 
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().
 2013-10-16 12:32:42 +02:00
Björn Schießle ada94fb558 Merge pull request #5333 from owncloud/avater_with_encryption 
avatars should also work with encryption after pr #5332 was merged
 2013-10-16 01:34:05 -07:00
Vincent Petry 5f249e1a54 Prevent renaming/deleting mount points 
Fixed permissions returned for mount points to not include update and
delete permissions.

Fixes #5291
 2013-10-15 14:58:58 +02:00
Bjoern Schiessle 25320f19df Merge branch 'master' into avater_with_encryption 2013-10-15 11:53:51 +02:00
Vincent Petry fa341e49a8 Merge pull request #5341 from owncloud/fix-logout-link-html 
Fix logout link HTML.
 2013-10-15 00:33:00 -07:00