upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27
14597 commits 882 branches 1195 tags 7.2 GiB
Commit graph

5037 commits

Author SHA1 Message Date
Thomas Müller
3d5e229ac5 Merge pull request #5442 from owncloud/extstorage-ignoreduplicateinserts 
Ignore duplicate inserts in file cache and mime type
 2013-10-23 07:47:50 -07:00
Thomas Müller
8c69a5388e Merge pull request #5478 from owncloud/core-logexceptionstacktrace 
Expand exception stack trace in log in debug mode
 2013-10-23 07:19:14 -07:00
VicDeo
959b0f9125 Merge pull request #5458 from owncloud/fixing-5222-master 
php 5.3 compatibility regarding OC\DB\Connection fixed
 2013-10-23 05:35:33 -07:00
Vincent Petry
c4dee281e6 Added $app parameter to logException 2013-10-23 13:58:42 +02:00
Vincent Petry
a542c57a7b Catch duplicate insertion errors while scanning files 
When two scanning processed run at the same time, for example when
scan.php and list.php were called at the same time on an external
storage mountpoint, duplicate insertion errors can occurs.

These errors are now logged and ignored.

Since both scans are running in parallel transactions, they don't see
each other's changes directly in the DB which can cause duplicate
insertion errors for mime types as well, but those mime types can't be
selected yet. The solution to this is to force-reload the mimetypes list
after the transaction is finished.

Fixes #5199
 2013-10-23 13:00:46 +02:00
Thomas Müller
3c710696e8 add missing file header 2013-10-23 12:27:54 +02:00
Vincent Petry
42c58220de Moved logException to OCP\Util class 2013-10-23 10:48:27 +02:00
Björn Schießle
2d14daf36b Merge pull request #5472 from owncloud/enc_init_status_on_enable 
Encryption set init status on enable
 2013-10-23 01:02:45 -07:00
Thomas Müller
4bf37f72b2 Merge pull request #5482 from owncloud/fix_weird_http_namespace 
Fix namespace for OCP\Appframework\Http
 2013-10-23 00:40:30 -07:00
Thomas Müller
cf61b1a977 Merge pull request #5391 from owncloud/undefined-property-in-schema-master 
removing pointless calls on quoteIdentifier() - reason: name on $tableDi...
 2013-10-22 22:46:43 -07:00
Thomas Tanghus
ad017285e1 Fix namespace for OCP\Appframework\Http 
To avoid having to use OCP\Appframework\Http\Http in the public - and stable
- API OCP\Appframework\Http is now both a class and a namespace.
 2013-10-23 05:57:34 +02:00
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
Bjoern Schiessle
bd450d6f6b add post_enable hook if a app gets enabled 2013-10-22 16:15:19 +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
7f1432600c fixing php 5.3.3 error: 
Undefined variable: this
lib/private/appframework/dependencyinjection/dicontainer.php:92
 2013-10-22 09:29:17 +02: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
e30e4ea1cc php 5.3 compatibility regarding OC\DB\Connection fixed 2013-10-21 22:51:56 +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
Victor Dubiniuk
97aff7c64e Use quoteIdentifier with proper objects 2013-10-21 22:31:57 +03: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
Thomas Müller
e55d2359b1 removing pointless calls on quoteIdentifier() - reason: name on $tableDiff doesn't exist and my design the name cannot be changed 
adding PHPDoc
 2013-10-17 14:54:37 +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