Thomas Müller
c3898061a8
Merge pull request #5544 from owncloud/fixing-3593-2-master
...
Add FileId header and switch fileid and instance id
2013-11-04 04:30:12 -08:00
Thomas Müller
0f266d0f62
set log level to DEBUG
2013-11-04 12:58:30 +01:00
Thomas Mueller
e37047b2a0
WIN: fixing Fatal error: Call to a member function logicToPhysical() on a non-object in C:\jenkins2\workspace\server-stable5-windows\database\mssql\label\WINDOWS\lib\files\storage\mappedlocal.php on line 311
2013-11-02 20:22:12 +01:00
Thomas Mueller
5ecebe211b
mssql: fixing lastInsertId() implementation
2013-11-02 20:21:19 +01:00
Thomas Mueller
eb3c5070c0
replace template function link_to_docs() with \OC_Helper::linkToDocs()
2013-11-02 19:11:46 +01:00
Morris Jobke
fad2149e3f
Merge pull request #5551 from owncloud/fix-5202-master
...
When updating an appstore app, execute a database update
2013-10-31 11:10:28 -07:00
Jörn Friedrich Dreyer
ae469b67a0
Merge pull request #5637 from owncloud/fix_privatedata
...
Fix privatedata
2013-10-31 10:26:47 -07:00
Jörn Friedrich Dreyer
b4cdac0a60
Merge pull request #5591 from owncloud/home-storage
...
Make home folders movable without requiring rescans
2013-10-31 10:20:03 -07:00
Andreas Fischer
d6ddb12c20
Get rid of the SELECT query. Try UPDATE, on failure INSERT.
2013-10-31 16:04:18 +01:00
Thomas Müller
aae6e76926
fixing undefined index in delete()
2013-10-31 10:24:28 +01:00
Thomas Müller
64d0b0d184
PHPDoc comment updated - checkLoggedIn() removed
2013-10-31 10:21:17 +01:00
Thomas Müller
0cec17ba87
no need to check if the user is logged in
2013-10-31 10:14:06 +01:00
Thomas Müller
47da2ef8db
fixing php notice: Undefined index key
2013-10-31 10:02:18 +01:00
Thomas Müller
b2929de0a7
no need to check if the user is logged in - this is already done in the ocs dispatcher itself
...
adding @return
2013-10-31 09:58:18 +01:00
Thomas Müller
64bfd21ccd
Merge branch 'master' into fix_privatedata
2013-10-31 09:05:35 +01:00
Thomas Müller
3f42c890be
we should check if a user is logged in before we check for admin privilege
2013-10-30 22:59:31 +01:00
Thomas Müller
261cd87efa
Merge branch 'master' into home-storage
2013-10-30 22:11:19 +01:00
Lukas Reschke
c1730d241c
Merge pull request #5615 from owncloud/fixing-5614-master
...
http header OCS-ApiRequest: true is required in case of session based OC...
2013-10-30 13:12:16 -07:00
Lukas Reschke
cba12e009f
Added missing HTTP prefix to the $_SERVER variable
2013-10-30 21:07:19 +01:00
Frank Karlitschek
330d026be7
fix the privatedata key value store
2013-10-30 19:36:29 +01:00
Robin Appelman
c9f3f2874f
Merge branch 'master' into update-parent-storage-mtime
...
Conflicts:
lib/private/files/cache/updater.php
2013-10-30 13:41:10 +01:00
Vincent Petry
de342a5ac7
Merge pull request #5603 from owncloud/fix_file_cache_updater_master
...
Fix file cache updater (backport to master of #5513 )
2013-10-30 02:31:08 -07:00
Thomas Müller
3d42e402c5
http header OCS-ApiRequest: true is required in case of session based OCS API calls
2013-10-29 23:07:27 +01:00
Bjoern Schiessle
e1e4c7c214
Merge branch 'master' into fix_file_cache_updater_master
2013-10-29 17:47:33 +01:00
Björn Schießle
e08f38f99b
Merge pull request #5605 from owncloud/fix_delete_user
...
remove user from cache if he was deleted successfully
2013-10-29 09:46:21 -07:00
Thomas Müller
e0bc89c87f
Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath
...
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-29 09:29:29 -07:00
Bjoern Schiessle
0d7d396d80
make sure that also the storage etag gets changed
2013-10-29 16:30:47 +01:00
Bjoern Schiessle
f021dad204
remove user from cache if he was deleted successfully
2013-10-29 15:50:33 +01:00
Bjoern Schiessle
a80ac9c492
make getUidAndFilename() private
2013-10-29 15:10:02 +01:00
Bjoern Schiessle
fcfac51aa1
backport of https://github.com/owncloud/core/pull/5513
2013-10-29 15:08:12 +01:00
Robin Appelman
b3626f34cd
Update the parent folders storage_mtime on write and delete to prevent rescans
2013-10-29 14:18:57 +01:00
Andreas Fischer
b3e39dd3d9
Map empty mimetypes to octet-stream for Oracle DBMS.
2013-10-29 14:18:42 +01:00
Andreas Fischer
fa6ae81149
Return early if fileinfo is there.
2013-10-29 13:48:30 +01:00
Andreas Fischer
68d13210bd
Reset mimetype to application/octet-stream on empty reply from file command.
2013-10-29 13:29:35 +01:00
Robin Appelman
0e92a4896d
dont use the home storage for non-existing users
2013-10-29 13:12:28 +01:00
Andreas Fischer
a04a01d51f
Do not calculate $isWrapped if not needed.
2013-10-29 12:54:30 +01:00
Thomas Müller
aaefb64306
Merge pull request #5493 from owncloud/fix-language-detection
...
Fix HTTP language detection
2013-10-28 16:37:12 -07:00
Robin Appelman
e273c14540
use the new home storage backend when no existing local storage backend exists for the user's home
2013-10-29 00:26:35 +01:00
Robin Appelman
f1e6e80eb1
add specialized storage backend for home folders
2013-10-29 00:14:23 +01:00
Bjoern Schiessle
db0fa6c529
use getHome() to delete users data
2013-10-29 18:01:37 +01:00
Jörn Friedrich Dreyer
682d6e8a80
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-28 14:18:20 +01:00
Vincent Petry
e62ca4ea4f
Append file etag to preview URLs
...
Fixes #5534
2013-10-28 14:14:55 +01:00
Morris Jobke
4750fbc226
Merge pull request #5550 from owncloud/fix-4716-master
...
'Update to' is shown when there is no update
2013-10-28 03:33:27 -07:00
Morris Jobke
78971c61e6
update documentation for app update
2013-10-28 11:27:51 +01:00
Arthur Schiwon
466b6c1ee0
local user backend shall search for both username and displayname, fixes #5401
2013-10-25 21:57:12 +02:00
Vincent Petry
ebcd9ae628
Added comment for clarification about fseek() call in quota.php
2013-10-25 16:15:01 +02:00
Bart Visscher
b6c67c4c63
'Update to' is shown when there is no update
...
See #4716
2013-10-25 15:41:59 +02:00
Bart Visscher
310c8400df
When updating an appstore app, execute a database update
...
See #5202
2013-10-25 15:38:08 +02:00
Thomas Müller
c455cb989b
add header 'OC-FileId' on PUT
2013-10-25 13:20:59 +02:00
Thomas Müller
3bca1519ee
switch instance id and file id
2013-10-25 13:20:29 +02:00
Thomas Müller
8253994262
using array_diff_assoc to detect diffs in values as well
2013-10-25 12:40:31 +02:00
Thomas Müller
f619f59f1c
cast storage_mtime to int
2013-10-25 12:39:50 +02:00
Vincent Petry
c8df27de73
Fixed quota stream to not wrap read-only fopen calls
2013-10-25 12:33:16 +02:00
Vincent Petry
d8b245490b
Fixed quota stream's fseek method
...
- Added missing return statement
- Added missing support for SEEK_END
- Fixes #5524
2013-10-25 12:09:46 +02:00
Thomas Müller
66813e9df6
Merge branch 'master' into fix-language-detection
2013-10-24 19:27:33 +02:00
Thomas Müller
222f1b8da2
Merge pull request #5494 from owncloud/fixing-3593-master
...
introducing new dav property {xmlns:oc="http://owncloud.org/ns }id
2013-10-24 09:41:56 -07:00
Thomas Müller
c5b8963b18
log the data arrays
2013-10-24 18:13:21 +02:00
Thomas Müller
a22f12cfe0
- fixing namespace
...
- remove property only if present
2013-10-24 14:40:43 +02:00
Thomas Müller
88d1e20d56
some logging added ....
2013-10-24 14:24:56 +02:00
Thomas Müller
808e9b0f51
Merge pull request #5402 from owncloud/fixing-5367-master
...
fixes chunked upload
2013-10-24 00:56:46 -07:00
Thomas Müller
db70b18c1d
Merge pull request #5496 from owncloud/prefer_png_from_theme_over_core_svg
...
prefer logo png from theme over svg from core
2013-10-23 14:44:43 -07:00
Thomas Müller
caa3a8d784
Merge pull request #5464 from owncloud/fixing-5456-master
...
Fixing 5456 master
2013-10-23 10:50:36 -07:00
Thomas Müller
54e0f1d739
fixing PHPDoc & grammar
2013-10-23 19:06:36 +02:00
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
Jörn Friedrich Dreyer
0bf034da96
prefer logo png from theme over svg from core
...
The logo images are specified in the php templates with eg `image_path('', 'logo-wide.svg')`. If that file exists the correct path will be served to the client in the html template. Then the `SVGSupport()` is checked in https://github.com/owncloud/core/blob/master/core/js/js.js#L701 which will replace `svg` with `png` in img tags and css background definitions.
fixes #5074
partially solves #5421 , but not when an svg has been specified in css and is then 'fixed' by js to point to a png which does not exist in the theme but is then might be resolved to an image from core .... well theoretical problem ... might not even be a problem
@karlitschek @jancborchardt please review
2013-10-23 16:44:56 +02:00
Thomas Müller
b02a485712
handle case where fileid is not set
2013-10-23 16:40:29 +02:00
Thomas Müller
b60ae11db8
introducing new dav property {xmlns:oc=" http://owncloud.org/ns }id
2013-10-23 16:03:57 +02:00
Andreas Fischer
06f2ae082e
Have to also strtolower() on available language name. Otherwise no match.
2013-10-23 15:39:50 +02:00
Andreas Fischer
daf93c4516
Sort, so 'de' is preferred over 'de_DE' when performing non-exact matching.
2013-10-23 15:38:54 +02:00
Andreas Fischer
c14b470ea2
Apply substring on the correct value.
2013-10-23 15:38:22 +02: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
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
Andreas Fischer
4c76dd3871
Better variable names.
2013-10-23 12:56:51 +02:00
Andreas Fischer
207f6d55ce
Fix coding style for else.
2013-10-23 12:39:12 +02:00
Thomas Müller
3c710696e8
add missing file header
2013-10-23 12:27:54 +02:00
Andreas Fischer
9d1b425b62
Correct indentation for default language.
2013-10-23 12:25:48 +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
6e0e621218
creating and deleting of file and folder 'Shared' in root is not allowed
2013-10-22 11:10:07 +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
Thomas Müller
2628601e79
adding oc-mtime handling to chunked upload
2013-10-21 15:00:28 +02:00
Thomas Müller
3cb666ad77
chunked files are assembled into a part file on the target storage followed by an atomic rename operation.
2013-10-21 13:21:39 +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
Frank Karlitschek
9e99f9d13d
the logfile shoudn't be world readable.
2013-10-18 17:15:02 +02:00