]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoMerge pull request #8987 from owncloud/lastindexid-debug
Vincent Petry [Tue, 15 Jul 2014 15:01:57 +0000 (17:01 +0200)]
Merge pull request #8987 from owncloud/lastindexid-debug

[DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL

10 years agoMerge pull request #9561 from libasys/patch-3
icewind1991 [Tue, 15 Jul 2014 14:54:57 +0000 (16:54 +0200)]
Merge pull request #9561 from libasys/patch-3

Fix Error undefined index: file_target

10 years agoMerge pull request #9621 from owncloud/fix_logger_implementation
Thomas Müller [Tue, 15 Jul 2014 14:05:15 +0000 (16:05 +0200)]
Merge pull request #9621 from owncloud/fix_logger_implementation

fix logger implementation

10 years agothrow exception if file is to large for trash bin
Bjoern Schiessle [Mon, 14 Jul 2014 15:03:36 +0000 (17:03 +0200)]
throw exception if file is to large for trash bin

10 years agoMerge pull request #9633 from owncloud/correct-icon-license
Thomas Müller [Tue, 15 Jul 2014 11:09:53 +0000 (13:09 +0200)]
Merge pull request #9633 from owncloud/correct-icon-license

Correct icon license

10 years agoMerge pull request #9570 from PhilJung/master
blizzz [Tue, 15 Jul 2014 09:43:31 +0000 (11:43 +0200)]
Merge pull request #9570 from PhilJung/master

[Issue #9559] identifiers uid=xxx must be considered as user DN and not ...

10 years agoremove unused 3rdparty clock and lock icons
Jan-Christoph Borchardt [Tue, 15 Jul 2014 09:37:38 +0000 (11:37 +0200)]
remove unused 3rdparty clock and lock icons

10 years agocorrect icon license, we use Elementary icons, not Silk anymore
Jan-Christoph Borchardt [Tue, 15 Jul 2014 09:35:49 +0000 (11:35 +0200)]
correct icon license, we use Elementary icons, not Silk anymore

10 years agofix logger implementation and test
Jörn Friedrich Dreyer [Mon, 14 Jul 2014 17:28:29 +0000 (19:28 +0200)]
fix logger implementation and test

10 years agoMerge pull request #9596 from owncloud/fixing-9503-master
Morris Jobke [Tue, 15 Jul 2014 07:15:32 +0000 (09:15 +0200)]
Merge pull request #9596 from owncloud/fixing-9503-master

reduce share action text to the user name only

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 15 Jul 2014 05:55:20 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #9562 from owncloud/users-groupfilter
Thomas Müller [Tue, 15 Jul 2014 05:40:55 +0000 (07:40 +0200)]
Merge pull request #9562 from owncloud/users-groupfilter

Do not filter groups, but therefore update the user counts according to  the filter

10 years agoFile written by blizzz
Philippe Jung [Mon, 14 Jul 2014 20:21:56 +0000 (22:21 +0200)]
File written by blizzz

10 years agoMerge pull request #9620 from owncloud/search-fileinfo-path
icewind1991 [Mon, 14 Jul 2014 19:32:17 +0000 (21:32 +0200)]
Merge pull request #9620 from owncloud/search-fileinfo-path

Use the correct path when building the FileInfo for the search result

10 years agofixing PHPDoc
Thomas Müller [Mon, 14 Jul 2014 19:19:08 +0000 (21:19 +0200)]
fixing PHPDoc

10 years agoremove dead code
Arthur Schiwon [Wed, 9 Jul 2014 10:19:50 +0000 (12:19 +0200)]
remove dead code

do not filter groups. but update the user count according to the filter

improve phpdoc

improve metadata runtime cache

add metadata tests

10 years agoreduce share action text to the user name only
Thomas Müller [Fri, 11 Jul 2014 13:16:26 +0000 (15:16 +0200)]
reduce share action text to the user name only

10 years agoUse the correct path when building the FileInfo for the search result
Robin Appelman [Mon, 14 Jul 2014 16:32:45 +0000 (18:32 +0200)]
Use the correct path when building the FileInfo for the search result

10 years agoMerge pull request #9228 from owncloud/remove-routing-singular-issues
Morris Jobke [Mon, 14 Jul 2014 15:10:07 +0000 (17:10 +0200)]
Merge pull request #9228 from owncloud/remove-routing-singular-issues

Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns

10 years agoMerge pull request #9598 from owncloud/fix-app-installation-master
Thomas Müller [Mon, 14 Jul 2014 15:05:36 +0000 (17:05 +0200)]
Merge pull request #9598 from owncloud/fix-app-installation-master

append file extension to the temporary file which contains the downloade...

10 years ago- Added test to trigger index id error
Vincent Petry [Wed, 11 Jun 2014 15:02:34 +0000 (17:02 +0200)]
- Added test to trigger index id error
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes

10 years agoMerge pull request #9546 from owncloud/user-public
icewind1991 [Mon, 14 Jul 2014 13:12:58 +0000 (15:12 +0200)]
Merge pull request #9546 from owncloud/user-public

Extends the public user api

10 years agoExpose the user manager in the public server container
Robin Appelman [Wed, 9 Jul 2014 13:43:06 +0000 (15:43 +0200)]
Expose the user manager in the public server container

10 years agoAdd public interfaces for User, UserManager and UserSession
Robin Appelman [Wed, 9 Jul 2014 13:32:33 +0000 (15:32 +0200)]
Add public interfaces for User, UserManager and UserSession

10 years agoMerge pull request #9539 from enoch85/patch-1
Björn Schießle [Mon, 14 Jul 2014 10:58:23 +0000 (12:58 +0200)]
Merge pull request #9539 from enoch85/patch-1

Fix for #9422

10 years agoMerge pull request #9572 from owncloud/deleteunsharetooltip
Björn Schießle [Mon, 14 Jul 2014 09:50:19 +0000 (11:50 +0200)]
Merge pull request #9572 from owncloud/deleteunsharetooltip

mountType attribute + delete hint fix

10 years agoMerge pull request #9605 from owncloud/sftp-missing-streamwrapper
Vincent Petry [Mon, 14 Jul 2014 09:45:35 +0000 (11:45 +0200)]
Merge pull request #9605 from owncloud/sftp-missing-streamwrapper

Re-add missing sftp:// stream wrapper

10 years agoAdded mountType attribute and adapted Delete action text
Vincent Petry [Thu, 10 Jul 2014 15:25:46 +0000 (17:25 +0200)]
Added mountType attribute and adapted Delete action text

Added mountType attribute for files/folder to indicated whether they are
regular, external or shared.

The client side then adapts the "Delete" action hint text based on this
information.

Only the mount roots must have the delete icon hint adapted.
To make this detectable on the client side, the mountType can now
be null, "shared", "shared-root", "external" or "external-root".

This also gives room to icon customization on the client side.

10 years agoMerge pull request #9571 from owncloud/fix_appstore_update_issue
Vincent Petry [Mon, 14 Jul 2014 08:00:39 +0000 (10:00 +0200)]
Merge pull request #9571 from owncloud/fix_appstore_update_issue

Fix update to button issue

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 14 Jul 2014 05:54:27 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #9563 from owncloud/version-delete-cache
Morris Jobke [Sun, 13 Jul 2014 16:14:14 +0000 (18:14 +0200)]
Merge pull request #9563 from owncloud/version-delete-cache

Remove deleted versions from the cache

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 13 Jul 2014 05:54:35 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoAdd short description explaining how SFTP ext storage class works.
Andreas Fischer [Sat, 12 Jul 2014 11:58:49 +0000 (13:58 +0200)]
Add short description explaining how SFTP ext storage class works.

10 years agoThe file providing the sftp:// scheme needs to be included manually.
Andreas Fischer [Sat, 12 Jul 2014 11:57:27 +0000 (13:57 +0200)]
The file providing the sftp:// scheme needs to be included manually.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 12 Jul 2014 05:54:39 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #9597 from owncloud/enc-removelegacytests
Thomas Müller [Fri, 11 Jul 2014 15:11:39 +0000 (17:11 +0200)]
Merge pull request #9597 from owncloud/enc-removelegacytests

Disable legacy encryption tests

10 years agoappend file extension to the temporary file which contains the downloaded archive...
Thomas Müller [Fri, 11 Jul 2014 14:51:59 +0000 (16:51 +0200)]
append file extension to the temporary file which contains the downloaded archive - in case of zip files fileinfo doesn't seem to return anything reliable

10 years agoDisable legacy encryption tests
Vincent Petry [Fri, 11 Jul 2014 13:20:58 +0000 (15:20 +0200)]
Disable legacy encryption tests

It seems these tests are not needed any more, but will now be skipped
instead until the case is cleared out.

10 years agoMerge pull request #9569 from owncloud/fix-require-of-blowfish-master
Morris Jobke [Thu, 10 Jul 2014 19:59:59 +0000 (21:59 +0200)]
Merge pull request #9569 from owncloud/fix-require-of-blowfish-master

[OC8] remove pointless require of Blowfish.php

10 years agoimprove check for duplicate apps
Georg Ehrke [Thu, 10 Jul 2014 15:18:10 +0000 (17:18 +0200)]
improve check for duplicate apps

10 years agoadd proper version comparision in OC_Installer::isUpdateAvailable
Georg Ehrke [Thu, 10 Jul 2014 15:17:55 +0000 (17:17 +0200)]
add proper version comparision in OC_Installer::isUpdateAvailable

10 years agoremove pointless require of Blowfish.php
Thomas Müller [Thu, 10 Jul 2014 14:27:07 +0000 (16:27 +0200)]
remove pointless require of Blowfish.php

10 years agoMerge pull request #9538 from owncloud/fileactions-cleanup
Vincent Petry [Thu, 10 Jul 2014 14:15:23 +0000 (16:15 +0200)]
Merge pull request #9538 from owncloud/fileactions-cleanup

Propagate file action changes to the file lists

10 years agoMerge pull request #9525 from owncloud/incrementuser2
Vincent Petry [Thu, 10 Jul 2014 14:09:18 +0000 (16:09 +0200)]
Merge pull request #9525 from owncloud/incrementuser2

increment/decrement group and user counts when necessary

10 years agoMerge pull request #9536 from owncloud/default-app-groups-master
Morris Jobke [Thu, 10 Jul 2014 13:45:44 +0000 (15:45 +0200)]
Merge pull request #9536 from owncloud/default-app-groups-master

Default app groups master

10 years agoRemove deleted versions from the cache
Robin Appelman [Thu, 10 Jul 2014 13:19:40 +0000 (15:19 +0200)]
Remove deleted versions from the cache

10 years ago[Issue #9559] identifiers uid=xxx must be considered as user DN and not as owncloud...
Philippe Jung [Thu, 10 Jul 2014 12:27:31 +0000 (14:27 +0200)]
[Issue #9559] identifiers uid=xxx must be considered as user DN and not as owncloud users

10 years agoMerge pull request #9516 from owncloud/kill-legacy-encryption-oc8
Vincent Petry [Thu, 10 Jul 2014 12:01:06 +0000 (14:01 +0200)]
Merge pull request #9516 from owncloud/kill-legacy-encryption-oc8

[OC8] Kill legacy encryption migration

10 years agoMerge pull request #9519 from owncloud/search-bounce
Vincent Petry [Thu, 10 Jul 2014 12:00:43 +0000 (14:00 +0200)]
Merge pull request #9519 from owncloud/search-bounce

debounce the search function

10 years agoUpdate share.php
libasys [Thu, 10 Jul 2014 11:19:35 +0000 (13:19 +0200)]
Update share.php

change isset with empty on line 1911

10 years agoUpdate share.php
libasys [Thu, 10 Jul 2014 11:02:04 +0000 (13:02 +0200)]
Update share.php

Added isset for error:
```
Undefined index: file_target at /var/www/owncloud/lib/private/share/share.php#1911
```

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 10 Jul 2014 08:59:40 +0000 (04:59 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #9460 from owncloud/versions-local
Vincent Petry [Thu, 10 Jul 2014 08:28:24 +0000 (10:28 +0200)]
Merge pull request #9460 from owncloud/versions-local

Dont assume local home storage for files_version

10 years agouse .filterAttr()
Thomas Müller [Wed, 9 Jul 2014 14:52:52 +0000 (16:52 +0200)]
use .filterAttr()

10 years agouse .filterAttr()
Thomas Müller [Wed, 9 Jul 2014 14:48:26 +0000 (16:48 +0200)]
use .filterAttr()

10 years agosome more cleanup
Thomas Müller [Wed, 9 Jul 2014 14:36:51 +0000 (16:36 +0200)]
some more cleanup

10 years agomagic strings - bad kungfu
Thomas Müller [Wed, 9 Jul 2014 14:13:33 +0000 (16:13 +0200)]
magic strings - bad kungfu

10 years agoremove the group in case the last user has removed from that group
Thomas Müller [Wed, 9 Jul 2014 13:29:38 +0000 (15:29 +0200)]
remove the group in case the last user has removed from that group

10 years agoFix for #9422
Daniel Hansson [Wed, 9 Jul 2014 12:40:05 +0000 (14:40 +0200)]
Fix for #9422

10 years agofixing JS synatx errors
Thomas Müller [Wed, 9 Jul 2014 12:30:28 +0000 (14:30 +0200)]
fixing JS synatx errors

10 years agoavoid global selector
Arthur Schiwon [Tue, 8 Jul 2014 18:12:10 +0000 (20:12 +0200)]
avoid global selector

10 years agoincrease/decrease everyone count on user creation/deletion
Arthur Schiwon [Tue, 8 Jul 2014 18:05:51 +0000 (20:05 +0200)]
increase/decrease everyone count on user creation/deletion

10 years agodecrease user count in affected groups after user delete
Arthur Schiwon [Sat, 5 Jul 2014 00:14:08 +0000 (02:14 +0200)]
decrease user count in affected groups after user delete

10 years agoincrement group counters when a user is created
Arthur Schiwon [Fri, 4 Jul 2014 23:21:18 +0000 (01:21 +0200)]
increment group counters when a user is created

10 years agoMerge pull request #9534 from owncloud/fix-9532-master
Thomas Müller [Wed, 9 Jul 2014 11:11:58 +0000 (13:11 +0200)]
Merge pull request #9534 from owncloud/fix-9532-master

De-double class name

10 years agoPropagate file action changes to the file lists
Vincent Petry [Wed, 9 Jul 2014 10:26:33 +0000 (12:26 +0200)]
Propagate file action changes to the file lists

Whenever an app needs to register an event late, it does that on the
original file actions object.

Since the file actions that the file list work on is a merged list, not
the original one, the registration event needs to be propagated there as
well.

10 years agoadding 'groups' entry to remote apps
Thomas Müller [Wed, 9 Jul 2014 08:20:52 +0000 (10:20 +0200)]
adding 'groups' entry to remote apps

10 years agotest class is already in preferences.php
Arthur Schiwon [Wed, 9 Jul 2014 08:49:40 +0000 (10:49 +0200)]
test class is already in preferences.php

10 years agofixing typos
Thomas Müller [Wed, 9 Jul 2014 08:20:17 +0000 (10:20 +0200)]
fixing typos

10 years agoDe-double class name
Thomas Müller [Wed, 9 Jul 2014 07:36:36 +0000 (09:36 +0200)]
De-double class name

10 years agoMerge pull request #9510 from libasys/patch-1
Thomas Müller [Wed, 9 Jul 2014 05:58:37 +0000 (07:58 +0200)]
Merge pull request #9510 from libasys/patch-1

BugFix missing $item on 'file_target' Line 1911

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 9 Jul 2014 05:55:51 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #9528 from owncloud/fix-apostrop
Thomas Müller [Wed, 9 Jul 2014 05:42:30 +0000 (07:42 +0200)]
Merge pull request #9528 from owncloud/fix-apostrop

fix apostrophe fixes #9486

10 years agofix apostrophe fixes #9486
Volkan Gezer [Tue, 8 Jul 2014 19:48:29 +0000 (21:48 +0200)]
fix apostrophe fixes #9486

10 years agoMerge pull request #9385 from owncloud/fix-7052
blizzz [Tue, 8 Jul 2014 19:33:50 +0000 (21:33 +0200)]
Merge pull request #9385 from owncloud/fix-7052

support for AD primary groups

10 years agosupport for AD primary groups
Arthur Schiwon [Tue, 1 Jul 2014 20:02:41 +0000 (22:02 +0200)]
support for AD primary groups

support for primary groups

actually the problem is only known on AD, it is only needed to take care of their attributes

adjust to ADs special behaviour

this change was not intended

cache the SID value so it is not requested over and over again

theres only one, use singular

we are access

add tests for new Access methods

add tests for new Group methods

address scrutinizer findings, mostly doc

call ldap_explode_dn from ldap wrapper, enables tests without php5-ldap

PHP Doc

yo dawg, i heard you like backslashes … php doc fix

PHPDoc updated and typos fixed while reviewing

10 years agoMerge pull request #9515 from owncloud/update-sharecleanupfix
Vincent Petry [Tue, 8 Jul 2014 16:09:26 +0000 (18:09 +0200)]
Merge pull request #9515 from owncloud/update-sharecleanupfix

Fix update cleanup to only affect file and folders

10 years agoMerge pull request #9507 from owncloud/fix-9302-master
Thomas Müller [Tue, 8 Jul 2014 15:39:34 +0000 (17:39 +0200)]
Merge pull request #9507 from owncloud/fix-9302-master

Upload abortion is now detected within the  OC_Connector_Sabre_File::put...

10 years agoMerge pull request #9412 from owncloud/public-api-activity
Thomas Müller [Tue, 8 Jul 2014 14:37:18 +0000 (16:37 +0200)]
Merge pull request #9412 from owncloud/public-api-activity

Public api activity

10 years agoport of #9500
Arthur Schiwon [Mon, 7 Jul 2014 22:19:17 +0000 (00:19 +0200)]
port of #9500

don't trigger update from checkPassword, it is already  called by userExists, this is enough.

do not write to database when the value is the same

add test cases. also split test classes in a file each, looks like only the first class is being executed

also appconfig shall not write to database if the value is unchanged

10 years agouse case insensitive LIKE when searching for files in mysql
Robin Appelman [Tue, 8 Jul 2014 10:41:28 +0000 (12:41 +0200)]
use case insensitive LIKE when searching for files in mysql

10 years agodebounce the search function
Robin Appelman [Tue, 8 Jul 2014 13:42:58 +0000 (15:42 +0200)]
debounce the search function

10 years agoMerge pull request #9504 from owncloud/repair-collation
Thomas Müller [Tue, 8 Jul 2014 13:13:46 +0000 (15:13 +0200)]
Merge pull request #9504 from owncloud/repair-collation

Add repair step to set MySQL collation to utf8_bin

10 years agoAdd repair step to set MySQL collation to utf8_bin
Robin Appelman [Mon, 7 Jul 2014 15:37:35 +0000 (17:37 +0200)]
Add repair step to set MySQL collation to utf8_bin
Set default collation of mysql connection to utf8_bin
Set utf_bin as default collation for new tables

10 years agoFix update cleanup to only affect file and folders
Vincent Petry [Tue, 8 Jul 2014 10:51:32 +0000 (12:51 +0200)]
Fix update cleanup to only affect file and folders

Fix bug in the SQL query that cleans up stray shares for removed
files/folders, which is now correctly limited to that item type instead
of also removing all other share types.

10 years agoMerge pull request #9509 from owncloud/ctjctj-fix_amazons3
Thomas Müller [Tue, 8 Jul 2014 12:25:47 +0000 (14:25 +0200)]
Merge pull request #9509 from owncloud/ctjctj-fix_amazons3

Fix Signiture Does Not Match when mounting Amazon S3 external storage

10 years agoKill legacy encryption migration
Thomas Müller [Tue, 8 Jul 2014 11:07:05 +0000 (13:07 +0200)]
Kill legacy encryption migration

10 years agoUpload abortion is now detected within the OC_Connector_Sabre_File::put()
Thomas Müller [Tue, 8 Jul 2014 07:44:46 +0000 (09:44 +0200)]
Upload abortion is now detected within the  OC_Connector_Sabre_File::put()
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless

Adding unit test testUploadAbort()

10 years agoBugFix missing $item on 'file_target' Line 1911
libasys [Tue, 8 Jul 2014 08:51:05 +0000 (10:51 +0200)]
BugFix missing $item on 'file_target' Line 1911

I think this should be right!

10 years agoIgnore core/js/jquery.placeholder.js
Thomas Müller [Tue, 8 Jul 2014 08:22:54 +0000 (10:22 +0200)]
Ignore core/js/jquery.placeholder.js

10 years agoIgnore core/js/snap.js
Thomas Müller [Tue, 8 Jul 2014 08:21:43 +0000 (10:21 +0200)]
Ignore core/js/snap.js

10 years agoFix Signiture Does Not Match when mounting Amazon S3 external storage
Christopher T. Johnson [Mon, 14 Apr 2014 13:49:43 +0000 (09:49 -0400)]
Fix Signiture Does Not Match when mounting Amazon S3 external storage

For some reason the aws-sdk-php package does not caclulate the
signiture correctly when accessing an object in a bucket with a name of
'.'.

When we are at the top of a S3 bucket there is a need(?) to have a directory
name.  Per standard Unix the name picked was '.' (dot or period).  This
choice exercises the aws-sdk bug.

This fix is to add a field to the method to store the name to use instead of
'.' which at this point is hard coded to '<root>'.  We also add a private
function 'cleanKey()' which will test for the '.' name and replace it with
the variable.  Finally all calls to manipulate objects where the path is
not obviously not '.' are processed through cleanKey().

An example where we don't process through clean key would be
'Key' => $path.'/',

Use correct relationship operator

Per feed back use === instead of ==

use '/' instead of '<root>'

10 years agoMerge pull request #9506 from owncloud/fix-fielset-legends
Jan-Christoph Borchardt [Tue, 8 Jul 2014 07:28:35 +0000 (09:28 +0200)]
Merge pull request #9506 from owncloud/fix-fielset-legends

specify CSS rule for warning & update fieldsets

10 years agoAdding new interface \OCP\Activity\IExtentsion
Thomas Müller [Thu, 3 Jul 2014 11:48:15 +0000 (13:48 +0200)]
Adding new interface \OCP\Activity\IExtentsion
Adding method getNotificationTypes()
Adding method filterNotificationTypes()
Adding method getDefaultTypes()
Adding method translate() and getTypeIcon()
Adding method getGroupParameter()
Adding method getNavigation()
Adding method getNavigation()
Adding method isFilterValid() and getQueryForFilter()
Adding unit tests for \OC\ActivityManager

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 8 Jul 2014 05:55:17 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agospecify CSS rule for warning & update fieldsets - fixes #9491
Morris Jobke [Mon, 7 Jul 2014 21:33:20 +0000 (23:33 +0200)]
specify CSS rule for warning & update fieldsets - fixes #9491

10 years agoMerge pull request #9495 from owncloud/remove-moved-mount
Vincent Petry [Mon, 7 Jul 2014 21:23:04 +0000 (23:23 +0200)]
Merge pull request #9495 from owncloud/remove-moved-mount

When changing the mountpoint of an external storage, ensure the old one ...

10 years agoMerge pull request #9505 from stephane84/fix-9497
Vincent Petry [Mon, 7 Jul 2014 21:11:23 +0000 (23:11 +0200)]
Merge pull request #9505 from stephane84/fix-9497

Refocus input field after user creation

10 years agoMerge pull request #9499 from owncloud/shares-hidetokenrecipient
Morris Jobke [Mon, 7 Jul 2014 18:02:59 +0000 (20:02 +0200)]
Merge pull request #9499 from owncloud/shares-hidetokenrecipient

Do not show recipient for link shares in file list

10 years agoMerge pull request #9502 from owncloud/add_ocsids
Morris Jobke [Mon, 7 Jul 2014 17:58:41 +0000 (19:58 +0200)]
Merge pull request #9502 from owncloud/add_ocsids

Add ocsids for shipped apps in core repo