]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoExternal storage space is now not counted in total space
Vincent Petry [Mon, 18 Nov 2013 16:29:30 +0000 (17:29 +0100)]
External storage space is now not counted in total space

Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.

Backport of 614e4d485c8b74f6879c401f8cbb93e9335bf9b3

11 years agoMerge pull request #5921 from owncloud/search_scrollto_stable5
Morris Jobke [Mon, 18 Nov 2013 23:24:01 +0000 (15:24 -0800)]
Merge pull request #5921 from owncloud/search_scrollto_stable5

backport search scrollto & filter to stable5

11 years agofixing js error in case the file name is a number
Thomas Müller [Mon, 18 Nov 2013 14:03:22 +0000 (15:03 +0100)]
fixing js error in case the file name is a number

11 years agobackport search scrollto & filter to stable5
Jörn Friedrich Dreyer [Mon, 18 Nov 2013 13:18:08 +0000 (14:18 +0100)]
backport search scrollto & filter to stable5

11 years agoMerge pull request #5883 from owncloud/stable5-singledotdirs
Vincent Petry [Fri, 15 Nov 2013 11:57:27 +0000 (03:57 -0800)]
Merge pull request #5883 from owncloud/stable5-singledotdirs

Stable5 single dot dirs

11 years agoMerge pull request #5307 from nicokaiser/fixing-3694-stable5
Frank Karlitschek [Fri, 15 Nov 2013 09:42:08 +0000 (01:42 -0800)]
Merge pull request #5307 from nicokaiser/fixing-3694-stable5

Fix OC_User::getDisplayName to persist between (browser) sessions. Fixes #3694

11 years agoAdded missing test with leading backslash
Vincent Petry [Thu, 14 Nov 2013 14:36:03 +0000 (15:36 +0100)]
Added missing test with leading backslash

11 years agoFiles app backend now normalizes paths before rendering templates
Vincent Petry [Thu, 14 Nov 2013 12:22:53 +0000 (13:22 +0100)]
Files app backend now normalizes paths before rendering templates

Before rendering breadcrumbs or the file list, the paths are now
normalized. This prevents the UI to show "." breadcrumbs in case the
path contains sections with "/./"

Fixes #5848

Backport of 008c3b80d6cca6a15299afe01f150f075813df8c

11 years agoFixed normalizePath() to strip out single dot dirs
Vincent Petry [Thu, 14 Nov 2013 12:15:03 +0000 (13:15 +0100)]
Fixed normalizePath() to strip out single dot dirs

Now removing "/./" and trailing "/." from the paths when normalizing.

Backport of c06d8bb0071839480f9e458e58630ca0c205b9cb

11 years agoMerge pull request #5811 from owncloud/fixing-5808-stable5
Thomas Müller [Mon, 11 Nov 2013 22:29:16 +0000 (14:29 -0800)]
Merge pull request #5811 from owncloud/fixing-5808-stable5

fixing Fatal error: Call to a member function logicToPhysical() on a non-object

11 years agofixes #5808
Thomas Müller [Mon, 11 Nov 2013 18:43:57 +0000 (19:43 +0100)]
fixes #5808

11 years agoMerge pull request #5725 from owncloud/fix_enabling_apps_on_oracle_cornercase
Thomas Müller [Mon, 11 Nov 2013 15:05:22 +0000 (07:05 -0800)]
Merge pull request #5725 from owncloud/fix_enabling_apps_on_oracle_cornercase

fix enabling apps for oracle - cornercase

11 years agoadd missing argument $query
Thomas Müller [Fri, 8 Nov 2013 15:55:01 +0000 (16:55 +0100)]
add missing argument $query

11 years agouse empty to check for null and ''
Jörn Friedrich Dreyer [Fri, 8 Nov 2013 13:57:05 +0000 (14:57 +0100)]
use empty to check for null and ''

11 years agoMerge pull request #5723 from owncloud/stable5-strayremembermecookiesfix
Owen Winkler [Thu, 7 Nov 2013 17:07:30 +0000 (09:07 -0800)]
Merge pull request #5723 from owncloud/stable5-strayremembermecookiesfix

Now removing stray old cookies from 5.0.12

11 years agoMerge pull request #5726 from owncloud/more_debug_output_stable5
Morris Jobke [Wed, 6 Nov 2013 21:39:14 +0000 (13:39 -0800)]
Merge pull request #5726 from owncloud/more_debug_output_stable5

add debug output related to app enablement

11 years agofix enabling apps for oracle cornercase
Jörn Friedrich Dreyer [Wed, 6 Nov 2013 17:28:26 +0000 (18:28 +0100)]
fix enabling apps for oracle cornercase

11 years agoadd debug output related to app enablement
Jörn Friedrich Dreyer [Wed, 6 Nov 2013 17:14:43 +0000 (18:14 +0100)]
add debug output related to app enablement

11 years agoNow removing stray old cookies from 5.0.12
Vincent Petry [Wed, 6 Nov 2013 16:37:35 +0000 (17:37 +0100)]
Now removing stray old cookies from 5.0.12

Cookies from 5.0.12 seemed to have an extra slash in the path.
Firefox doesn't allow to remove them if the trailing slash isn't there,
thus making it impossible to logout correctly.

This fix adds extra code to delete such stray cookies.

11 years agolet's increase the version number once more
Frank Karlitschek [Tue, 5 Nov 2013 19:40:25 +0000 (20:40 +0100)]
let's increase the version number once more

11 years agoMerge pull request #5704 from owncloud/fixing-5663-stable5
Frank Karlitschek [Tue, 5 Nov 2013 19:39:38 +0000 (11:39 -0800)]
Merge pull request #5704 from owncloud/fixing-5663-stable5

we create the cookies for the url path \OC::$WEBROOT - as a result we sh...

11 years agowe create the cookies for the url path \OC::$WEBROOT - as a result we shall 'remove...
Thomas Müller [Tue, 5 Nov 2013 14:00:28 +0000 (15:00 +0100)]
we create the cookies for the url path \OC::$WEBROOT - as a result we shall 'remove' them with the same path
 unsetMagicInCookie() is supposed to be static

11 years ago5.0.13 v5.0.13
Frank Karlitschek [Tue, 5 Nov 2013 02:52:16 +0000 (03:52 +0100)]
5.0.13

11 years agoWhen updating an appstore app, execute a database update
Bart Visscher [Fri, 25 Oct 2013 13:38:08 +0000 (15:38 +0200)]
When updating an appstore app, execute a database update

See #5202

11 years ago5.0.13 RC1
Frank Karlitschek [Fri, 1 Nov 2013 02:12:21 +0000 (03:12 +0100)]
5.0.13 RC1

11 years agoMerge pull request #5583 from frisco82/backportCookieChanges
Thomas Müller [Thu, 31 Oct 2013 22:09:01 +0000 (15:09 -0700)]
Merge pull request #5583 from frisco82/backportCookieChanges

Backport of  #3985 (Invalid remember me token)

11 years agoMerge pull request #5640 from owncloud/backport_executeaudited_stable5
Thomas Müller [Thu, 31 Oct 2013 17:28:49 +0000 (10:28 -0700)]
Merge pull request #5640 from owncloud/backport_executeaudited_stable5

Backport executeaudited stable5

11 years agoMerge pull request #5647 from owncloud/fix4390_stable5
Thomas Müller [Thu, 31 Oct 2013 16:42:50 +0000 (09:42 -0700)]
Merge pull request #5647 from owncloud/fix4390_stable5

Fix4390 stable5

11 years agouse closest instead of parent
Jörn Friedrich Dreyer [Thu, 31 Oct 2013 14:53:07 +0000 (15:53 +0100)]
use closest instead of parent

11 years agoMerge pull request #5574 from owncloud/fixing-5271-stable5
Thomas Müller [Thu, 31 Oct 2013 11:59:50 +0000 (04:59 -0700)]
Merge pull request #5574 from owncloud/fixing-5271-stable5

we should check if a user is logged in before we check for admin privile...

11 years agoadding second argument to DatabaseException
Thomas Müller [Thu, 31 Oct 2013 11:44:51 +0000 (12:44 +0100)]
adding second argument to DatabaseException
updated some PHPDoc comments
fixing undefined variable in line 789 - actually unrelated but well ....

11 years agoMerge pull request #5579 from owncloud/backport_5496
Thomas Müller [Thu, 31 Oct 2013 11:30:48 +0000 (04:30 -0700)]
Merge pull request #5579 from owncloud/backport_5496

backport of #5496, fixes #5421 for stable5

11 years agoMerge pull request #5327 from owncloud/backport-4867-stable5
Thomas Müller [Thu, 31 Oct 2013 11:27:04 +0000 (04:27 -0700)]
Merge pull request #5327 from owncloud/backport-4867-stable5

[stable5] Adding detection of aborted uploads for chunked uploads

11 years agoextend unit test to directories starting or ending in whitespace
Jörn Friedrich Dreyer [Thu, 31 Oct 2013 10:55:58 +0000 (11:55 +0100)]
extend unit test to directories starting or ending in whitespace

11 years agoMerge pull request #5630 from owncloud/backport_home_storage_stable5
Thomas Müller [Thu, 31 Oct 2013 10:32:23 +0000 (03:32 -0700)]
Merge pull request #5630 from owncloud/backport_home_storage_stable5

backport home storage to stable5

11 years agodisable MDB2_PORTABILITY_RTRIM
Jörn Friedrich Dreyer [Thu, 31 Oct 2013 10:19:58 +0000 (11:19 +0100)]
disable MDB2_PORTABILITY_RTRIM
fixes dnd into folders ending in whitespace on oracle
unnecessary portability option because only affects fixed length character columns. luckily we dont have that kind of columns: the text datatype is transformed into varchar by MDB2

11 years agoallow dnd into folders starting with whitespace
Jörn Friedrich Dreyer [Thu, 31 Oct 2013 10:15:12 +0000 (11:15 +0100)]
allow dnd into folders starting with whitespace

11 years agoremove leftover execute() and unused variables
Jörn Friedrich Dreyer [Thu, 31 Oct 2013 09:27:42 +0000 (10:27 +0100)]
remove leftover execute() and unused  variables

11 years agocall \OC_Util::checkLoggedIn() on checkSubAdminUser() as well
Thomas Müller [Wed, 30 Oct 2013 21:55:48 +0000 (22:55 +0100)]
call \OC_Util::checkLoggedIn() on checkSubAdminUser() as well

11 years agouse executeAudited() for all cache queries
Jörn Friedrich Dreyer [Wed, 30 Oct 2013 18:52:48 +0000 (19:52 +0100)]
use executeAudited() for all cache queries

Conflicts:
lib/files/cache/cache.php

11 years agobackport executeAudited()
Jörn Friedrich Dreyer [Wed, 30 Oct 2013 18:52:10 +0000 (19:52 +0100)]
backport executeAudited()

11 years agoallow to share a file/folder as public link also if one of it parents was already...
Bjoern Schiessle [Wed, 30 Oct 2013 16:03:53 +0000 (17:03 +0100)]
allow to share a file/folder as public link also if one of it parents was already shared as link

11 years agoMerge pull request #5487 from owncloud/backport_search_in_shared_files_to_stable5
Frank Karlitschek [Wed, 30 Oct 2013 16:42:21 +0000 (09:42 -0700)]
Merge pull request #5487 from owncloud/backport_search_in_shared_files_to_stable5

backport search in shared files to stable5

11 years agoMerge pull request #5613 from owncloud/upload_to_shared
Jörn Friedrich Dreyer [Wed, 30 Oct 2013 16:10:23 +0000 (09:10 -0700)]
Merge pull request #5613 from owncloud/upload_to_shared

fix check if we upload to /Shared

11 years agobackport home storage to stable5
Jörn Friedrich Dreyer [Wed, 30 Oct 2013 15:52:17 +0000 (16:52 +0100)]
backport home storage to stable5

11 years agofix placholder counting
Jörn Friedrich Dreyer [Wed, 30 Oct 2013 14:02:35 +0000 (15:02 +0100)]
fix placholder counting

11 years agoremove unused variable
Bjoern Schiessle [Wed, 30 Oct 2013 10:39:30 +0000 (11:39 +0100)]
remove unused variable

11 years agoif the database doesn't contain any information about the recovery mode than we assum...
Bjoern Schiessle [Wed, 30 Oct 2013 10:28:36 +0000 (11:28 +0100)]
if the database doesn't contain any information about the recovery mode than we assume that it is disabled

11 years agofix check if we upload to /Shared
Bjoern Schiessle [Tue, 29 Oct 2013 21:49:12 +0000 (22:49 +0100)]
fix check if we upload to /Shared

11 years agofixes #5367
Thomas Müller [Tue, 29 Oct 2013 15:40:18 +0000 (16:40 +0100)]
fixes #5367

Conflicts:
lib/connector/sabre/file.php

11 years agocleanup PR
Jörn Friedrich Dreyer [Tue, 29 Oct 2013 12:34:53 +0000 (13:34 +0100)]
cleanup PR
- extract method,
- introduce MAX CHUNK SIZE const with 999 (reduce this by the number of additional query parameters),
- fix whitespace

11 years agoMerge pull request #5513 from owncloud/fix_file_cache_updater
Björn Schießle [Tue, 29 Oct 2013 13:40:07 +0000 (06:40 -0700)]
Merge pull request #5513 from owncloud/fix_file_cache_updater

Fix file cache updater

11 years agomake getUidAndFilename() private
Bjoern Schiessle [Tue, 29 Oct 2013 13:39:44 +0000 (14:39 +0100)]
make getUidAndFilename() private

11 years agodisable encryption app for file cache updater test since the test doesn't use a compl...
Bjoern Schiessle [Tue, 29 Oct 2013 10:47:06 +0000 (11:47 +0100)]
disable encryption app for file cache updater test since the test doesn't use a completely initialized oc filesystem

11 years agomake sure that hooks are only executed when the app is enabled
Bjoern Schiessle [Tue, 29 Oct 2013 10:45:40 +0000 (11:45 +0100)]
make sure that hooks are only executed when the app is enabled

11 years agotests should work if I explicitely log-in as a user
Bjoern Schiessle [Tue, 29 Oct 2013 09:12:53 +0000 (10:12 +0100)]
tests should work if I explicitely log-in as a user

11 years agomake sure that we operate on the owners Path because this path needs to be updated
Bjoern Schiessle [Tue, 29 Oct 2013 08:55:40 +0000 (09:55 +0100)]
make sure that we operate on the owners Path because this path needs to be updated
check the storage for every iteration to make sure that we update the correct cache entry

11 years agofixes #5367
Thomas Müller [Thu, 17 Oct 2013 18:20:13 +0000 (20:20 +0200)]
fixes #5367

Conflicts:
lib/connector/sabre/file.php

11 years agoMerge branch 'stable5' into backport-4867-stable5
Thomas Müller [Mon, 28 Oct 2013 20:51:25 +0000 (21:51 +0100)]
Merge branch 'stable5' into backport-4867-stable5

11 years agoFix logout issue with tokens
Ramiro Aparicio [Mon, 28 Oct 2013 14:43:53 +0000 (15:43 +0100)]
Fix logout issue with tokens

11 years agobackport of #5496, fixes #5421 for stable5
Jörn Friedrich Dreyer [Mon, 28 Oct 2013 13:24:34 +0000 (14:24 +0100)]
backport of #5496, fixes #5421 for stable5

11 years agoremove debug output, add comment
Bjoern Schiessle [Mon, 28 Oct 2013 11:00:48 +0000 (12:00 +0100)]
remove debug output, add comment

11 years agoShare Updater doesn't need to call the cache updaters correctFolder method, this...
Bjoern Schiessle [Mon, 28 Oct 2013 11:00:16 +0000 (12:00 +0100)]
Share Updater doesn't need to call the cache updaters correctFolder method, this method always expect a path relativ to the current user

11 years agocheck storage for every iteration
Bjoern Schiessle [Mon, 28 Oct 2013 10:37:22 +0000 (11:37 +0100)]
check storage for every iteration

11 years agowe should check if a user is logged in before we check for admin privilege
Thomas Müller [Mon, 28 Oct 2013 10:32:43 +0000 (11:32 +0100)]
we should check if a user is logged in before we check for admin privilege

11 years agoMerge pull request #5465 from owncloud/create-custom-logfile-stable5
Thomas Müller [Sun, 27 Oct 2013 22:20:02 +0000 (15:20 -0700)]
Merge pull request #5465 from owncloud/create-custom-logfile-stable5

Stable5: Try to create custom log file before falling back to default.

11 years agoFixed group management dropdown in IE9
Vincent Petry [Sun, 27 Oct 2013 18:43:51 +0000 (19:43 +0100)]
Fixed group management dropdown in IE9

There is a syntax error in the "em" tag that isn't close that seem
to mess up in IE9.

- Fix was found in 0bcb0439 for multiselect.js, so backported this partially.
- Fixes #2569

11 years agoMerge pull request #5425 from buczek/fix-ldap-login
blizzz [Fri, 25 Oct 2013 09:10:23 +0000 (02:10 -0700)]
Merge pull request #5425 from buczek/fix-ldap-login

Fix ldap login

11 years agochanged the logic, this should fix the tests
Bjoern Schiessle [Thu, 24 Oct 2013 15:24:49 +0000 (17:24 +0200)]
changed the logic, this should fix the tests

11 years agoremove debug code
Bjoern Schiessle [Thu, 24 Oct 2013 14:14:34 +0000 (16:14 +0200)]
remove debug code

11 years agoresolvePath() needs to resolve the path for the owner, otherwise it doesn't work...
Bjoern Schiessle [Thu, 24 Oct 2013 10:27:22 +0000 (12:27 +0200)]
resolvePath() needs to resolve the path for the owner, otherwise it doesn't work for Shared files
correctFolder() correct folder for the owner of the file. The Shared folder for the other users gets updated by the files_sharing app

11 years agoreturn -1 if file is empty otherwise we run into infinite loops
Bjoern Schiessle [Thu, 24 Oct 2013 10:26:38 +0000 (12:26 +0200)]
return -1 if file is empty otherwise we run into infinite loops

11 years agoMerge pull request #5457 from owncloud/fix5438
Thomas Müller [Wed, 23 Oct 2013 21:51:32 +0000 (14:51 -0700)]
Merge pull request #5457 from owncloud/fix5438

LDAP: cookies from Paged Search must only be used once, as stated in RFC...

11 years agoMerge pull request #5416 from owncloud/sharing_fix_infinite_loop
Björn Schießle [Wed, 23 Oct 2013 14:31:56 +0000 (07:31 -0700)]
Merge pull request #5416 from owncloud/sharing_fix_infinite_loop

sharing: fix infinite loop

11 years agoMerge pull request #5145 from guruz/files_encryption_511_fix_chunk_calc
Björn Schießle [Wed, 23 Oct 2013 14:11:45 +0000 (07:11 -0700)]
Merge pull request #5145 from guruz/files_encryption_511_fix_chunk_calc

files_encryption: Fix getFileSize()

11 years agoOC5 does not have executeAudited
Jörn Friedrich Dreyer [Wed, 23 Oct 2013 12:40:47 +0000 (14:40 +0200)]
OC5 does not have executeAudited

11 years agoMerge branch 'stable5' into sharing_fix_infinite_loop
Bjoern Schiessle [Wed, 23 Oct 2013 12:30:14 +0000 (14:30 +0200)]
Merge branch 'stable5' into sharing_fix_infinite_loop

11 years agobackport search in shared files to stable5
Jörn Friedrich Dreyer [Wed, 23 Oct 2013 10:33:23 +0000 (12:33 +0200)]
backport search in shared files to stable5

11 years agoMerge pull request #5485 from owncloud/fixing-oci-stable5
Andreas Fischer [Wed, 23 Oct 2013 09:55:18 +0000 (11:55 +0200)]
Merge pull request #5485 from owncloud/fixing-oci-stable5

adding backticks to satisfy Oracle

* owncloud/fixing-oci-stable5:
  adding backticks to satisfy Oracle

11 years agoadding backticks to satisfy Oracle
Thomas Müller [Wed, 23 Oct 2013 09:00:29 +0000 (11:00 +0200)]
adding backticks to satisfy Oracle

11 years agofix array key
Bjoern Schiessle [Mon, 14 Oct 2013 14:43:18 +0000 (16:43 +0200)]
fix array key

11 years agotry to fix unencrypted file size if it doesn't look plausible
Bjoern Schiessle [Mon, 14 Oct 2013 14:34:14 +0000 (16:34 +0200)]
try to fix unencrypted file size if it doesn't look plausible

11 years agoTry to create custom log file before falling back to default.
Andreas Fischer [Sun, 20 Oct 2013 21:58:07 +0000 (23:58 +0200)]
Try to create custom log file before falling back to default.

11 years agoLDAP: cookies from Paged Search must only be used once, as stated in RFC 2696. Also...
Arthur Schiwon [Mon, 21 Oct 2013 20:48:00 +0000 (22:48 +0200)]
LDAP: cookies from Paged Search must only be used once, as stated in RFC 2696. Also, if we go with Paged Search it, we need to use it with any read operation. Fixes #5438 and possibly #2545

11 years agobackport of https://github.com/owncloud/core/pull/5247
Bjoern Schiessle [Mon, 21 Oct 2013 15:50:10 +0000 (17:50 +0200)]
backport of https://github.com/owncloud/core/pull/5247

ensure the view's root is a subfolder of the the default root, not only starting the same

11 years agofiles_encryption: Fix getFileSize()
Markus Goetz [Sat, 5 Oct 2013 16:00:46 +0000 (18:00 +0200)]
files_encryption: Fix getFileSize()

For certain file sizes, we rounded to the wrong chunk number
and the returned bogus results. This should fix
https://github.com/owncloud/mirall/issues/1009

11 years agofix recursive delete for smb
Robin Appelman [Tue, 1 Oct 2013 20:33:58 +0000 (22:33 +0200)]
fix recursive delete for smb

11 years agofix using touch to create a file for smb
Robin Appelman [Tue, 1 Oct 2013 20:31:22 +0000 (22:31 +0200)]
fix using touch to create a file for smb

11 years agoMerge pull request #5420 from owncloud/fix5081
blizzz [Fri, 18 Oct 2013 21:57:48 +0000 (14:57 -0700)]
Merge pull request #5420 from owncloud/fix5081

LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks...

11 years agoMerge pull request #5414 from owncloud/ocs_share_api_stable5
Björn Schießle [Fri, 18 Oct 2013 16:13:17 +0000 (09:13 -0700)]
Merge pull request #5414 from owncloud/ocs_share_api_stable5

ocs share api stable5

11 years agomail_send doesn't exists in stable5
Bjoern Schiessle [Fri, 18 Oct 2013 16:07:16 +0000 (18:07 +0200)]
mail_send doesn't exists in stable5

11 years agorun first getUsersItemShared() with the owner
Bjoern Schiessle [Fri, 18 Oct 2013 15:48:35 +0000 (17:48 +0200)]
run first getUsersItemShared() with the owner

11 years agoupdate etags for user we haven't checked yet
Bjoern Schiessle [Fri, 18 Oct 2013 15:47:01 +0000 (17:47 +0200)]
update etags for user we haven't checked yet

11 years agokeep a list of users we already checked to avoid loops
Bjoern Schiessle [Fri, 18 Oct 2013 15:35:56 +0000 (17:35 +0200)]
keep a list of users we already checked to avoid loops

11 years agomake sure the shared ldap connection is rebound to the configured user after being...
Donald Buczek [Fri, 18 Oct 2013 15:13:36 +0000 (17:13 +0200)]
make sure the shared ldap connection is rebound to the configured user after being used for password checking.

11 years agoLDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to @sfyang
Arthur Schiwon [Fri, 18 Oct 2013 12:40:08 +0000 (14:40 +0200)]
LDAP: Fix base-comparison with multibyte characters, fixes #5081. Thanks to @sfyang

11 years agoenable files sharing tests
Bjoern Schiessle [Fri, 18 Oct 2013 12:27:44 +0000 (14:27 +0200)]
enable files sharing tests

11 years agoMerge branch 'stable5' into ocs_share_api_stable5
Bjoern Schiessle [Fri, 18 Oct 2013 12:26:45 +0000 (14:26 +0200)]
Merge branch 'stable5' into ocs_share_api_stable5

11 years agodon't cache if the encryption is enabled, this can lead to problems during unit testing
Bjoern Schiessle [Thu, 10 Oct 2013 13:02:52 +0000 (15:02 +0200)]
don't cache if the encryption is enabled, this can lead to problems during unit testing
backport from: https://github.com/owncloud/core/commit/909af2b62e75d1a5db866466074f2bcb95b864dc

11 years agoMerge branch 'stable5' into ocs_share_api_stable5
Bjoern Schiessle [Fri, 18 Oct 2013 12:08:40 +0000 (14:08 +0200)]
Merge branch 'stable5' into ocs_share_api_stable5