wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
15039 commits 157 branches 562 tags 714 MiB
Commit graph

5211 commits

Author SHA1 Message Date
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
Morris Jobke
34c1512466 Merge pull request #5601 from owncloud/fix-mimetype-detection 
Fix mimetype detection
 2013-10-29 07:47:20 -07:00
Morris Jobke
7223b5acce Merge pull request #5396 from owncloud/fix-sharing-code 
Fix sharing error message - id -> file name
 2013-10-29 07:33:23 -07: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
Jenkins for ownCloud
b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04: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
Morris Jobke
c61d328ab9 Merge pull request #3889 from owncloud/apps_preload 
Don't load the apps when we need to upgrade
 2013-10-28 03:17:52 -07:00
Jenkins for ownCloud
8df8211225 [tx-robot] updated from transifex 2013-10-27 07:27:22 -04:00
Jenkins for ownCloud
119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04: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
3917d18980 Merge pull request #5528 from frisco82/changeUpadateNotification 
Changed update message to be more instructive
 2013-10-24 10:28:17 -07:00
Thomas Müller
66813e9df6 Merge branch 'master' into fix-language-detection 2013-10-24 19:27:33 +02:00
Ramiro Aparicio
3a81c8e3af Changed update message to be more instructive, changed update style to be less aggresive 
Fix br tags

Improve english messages
 2013-10-24 19:21:40 +02:00
Thomas Müller
54e9d8c306 Merge pull request #5507 from owncloud/webdav-removeredirectfromindex 
Remove WebDAV redirect from the root path
 2013-10-24 10:05:21 -07: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
Vincent Petry
c186f33428 Remove WebDAV redirect from the root path 
This will prevent people mounting the root path.
They should use the full webdav path instead.

Fixes #4923
 2013-10-24 10:34:09 +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
291cdbdd98 Merge pull request #5497 from owncloud/ie8-placeholdershim 
Ie8 placeholdershim
 2013-10-23 13:18:37 -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
Vincent Petry
086b82bd69 Fixed sharing dropdown placeholders in IE8/9 
Added jquery.placeholder shim to handle input field placeholders in IE8/9
 2013-10-23 18:51:25 +02:00
Thomas Müller
1317b7c03d pass the name of the item source from the browser to the server - no need to get the data via complicated db queries 2013-10-23 18:39:37 +02:00
Thomas Müller
1909288fcb Merge branch 'master' into fix-sharing-code 2013-10-23 17:16:16 +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
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
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
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
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
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
Andreas Fischer
c85cc13d1a Allow null as cache parameter (if no cache was found) and for cache removal. 2013-10-22 11:17:15 +02:00
Andreas Fischer
dde832b76c Only write-back on cache miss. 2013-10-22 11:17:15 +02:00
Andreas Fischer
f5e2b92688 Only use autoloader cache when 'instanceid' is available. 2013-10-22 11:17:15 +02:00
Andreas Fischer
eb6637682e Inject memoryCache into Autoloader. Remove recursion-prevention hack. 2013-10-22 11:17:15 +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
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
Thomas Müller
d2d2c9a46d fixes #5367 2013-10-17 20:20:13 +02:00
Jenkins for ownCloud
2845747528 [tx-robot] updated from transifex 2013-10-17 13:48:52 -04:00
Morris Jobke
f9bbfad3e5 Fix sharing error message - id -> file name 
fixe #2827
 2013-10-17 16:45:11 +02: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
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
Thomas Müller
e3489b36ff any preview requiring the which command will not be used on Windows 2013-10-15 00:15:45 +02:00
Andreas Fischer
06f9b7b862 Fix logout link HTML. 
<a id="logout" href=/projects/owncloud/core/index.php?logout=true>
 2013-10-14 22:31:13 +02:00
Thomas Müller
6df5c7ebd5 streamCopy() should return proper structure. 
Callers of streamCopy() expect an array to be returned containing count and result.
 2013-10-14 21:33:23 +02:00
Bjoern Schiessle
3380bd650f avatars should also work with encryption after pr #5332 was merged 2013-10-14 17:30:24 +02:00
Thomas Müller
c97b52090e Merge pull request #4867 from owncloud/fixing-4546-master 
Adding detection of aborted uploads for chunked uploads
 2013-10-14 06:39:32 -07:00
Thomas Müller
5318df3b3c there shall be tabs 2013-10-14 14:51:25 +02:00
Thomas Müller
fb3829e8b8 file system is now initialized with apache authentication as well 2013-10-14 14:46:43 +02:00
Georg Ehrke
71601a7c6f implement previews for markdown 2013-10-14 14:10:47 +02:00
Frank Karlitschek
258ccdfabe case insensitive sort 2013-10-14 11:15:04 +02:00
Frank Karlitschek
a201a66878 fix style 2013-10-14 10:57:00 +02:00
Thomas Müller
a5e808defc Merge branch 'master' into fixing-4546-master 
Conflicts:
	lib/private/connector/sabre/file.php
 2013-10-14 10:56:50 +02:00