4d74aa09bf
Port of #9584
...
Fixes #9583
lib/private/group/metadata.php: For subadmins also return an array of groups, indexed by their GIDs.
settings/users.php: Convert array of arrays to array of GIDs before calling into OC_Group::displayNamesInGroups.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Fix indentation.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Renamed $grp to $group in foreach loop.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Use is_null() instead of empty() when checking the return value of GroupManager::get().
Additionally, $grp was renamed to $group inside
\OC\Group\MetaData::fetchGroups().
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
Updated code to reflect changes introduced to \OC\Group\MetaData.
Now that fetchGroups() does not exist anymore and getGroups() is called
directory, the 'groups' property does not exist anymore.
Instead, we now generate that array on the fly and return it from getGroups.
Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-07-16 12:23:26 +02:00
7d8a8e78fa
Merge pull request #9640 from owncloud/fix_9627
...
make sure that 'OC_Theme' exists before checking if the method exists
2014-07-16 10:12:52 +02:00
0155326227
[tx-robot] updated from transifex
2014-07-16 01:55:55 -04:00
0f9b22107b
Merge pull request #9644 from owncloud/fix_user_api
...
Fix user api
2014-07-15 23:57:02 +02:00
10b59f101f
Merge pull request #9540 from owncloud/use_fileinfo_in_search_results
...
use fileinfo object in search results
2014-07-15 19:49:36 +02:00
d22904612b
Merge pull request #9628 from edozzo/master
...
Userlist: async load doesnt fill checked group/subadmin array
2014-07-15 19:10:01 +02:00
6967d328e2
make sure that 'OC_Theme' exists before checking if the method exists
2014-07-15 17:48:25 +02:00
818929274d
use UserSession service to resolve user id
2014-07-15 17:42:17 +02:00
b3106c321c
use correct IUser in interface
2014-07-15 17:41:44 +02:00
bf657883d2
Merge pull request #9639 from owncloud/prevent-irc-trolls-fro-using-this
...
Add warning because there are people that enable this app because they think it's the WebDAV implementation of ownCloud
2014-07-15 17:28:17 +02:00
a8d95356ca
Merge pull request #8987 from owncloud/lastindexid-debug
...
[DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL
2014-07-15 17:01:57 +02:00
61b5a770e4
Merge pull request #9561 from libasys/patch-3
...
Fix Error undefined index: file_target
2014-07-15 16:54:57 +02:00
6c93bcc814
Merge pull request #9621 from owncloud/fix_logger_implementation
...
fix logger implementation
2014-07-15 16:05:15 +02:00
bebecc6bbf
Update info.xml
2014-07-15 15:35:02 +02:00
40fe1275de
throw exception if file is to large for trash bin
2014-07-15 13:56:02 +02:00
cd97847cd6
Strinct comparsion fix
2014-07-15 13:44:41 +02:00
6d76165873
Merge pull request #9633 from owncloud/correct-icon-license
...
Correct icon license
2014-07-15 13:09:53 +02:00
0ce8f85bae
Merge pull request #9570 from PhilJung/master
...
[Issue #9559 ] identifiers uid=xxx must be considered as user DN and not ...
2014-07-15 11:43:31 +02:00
de52be7189
remove unused 3rdparty clock and lock icons
2014-07-15 11:37:38 +02:00
e2aba4efea
correct icon license, we use Elementary icons, not Silk anymore
2014-07-15 11:35:49 +02:00
4a855be814
fix logger implementation and test
2014-07-15 10:10:16 +02:00
4c0ca27909
Merge pull request #9596 from owncloud/fixing-9503-master
...
reduce share action text to the user name only
2014-07-15 09:15:32 +02:00
ff11ef3c5b
[tx-robot] updated from transifex
2014-07-15 01:55:20 -04:00
26d9993b3e
Userlist: async load doesnt fill checked group/subadmin array
2014-07-15 07:52:04 +02:00
e8f02b9410
Merge pull request #9562 from owncloud/users-groupfilter
...
Do not filter groups, but therefore update the user counts according to the filter
2014-07-15 07:40:55 +02:00
c13cb6145b
File written by blizzz
2014-07-14 22:21:56 +02:00
592dad0a71
Merge pull request #9620 from owncloud/search-fileinfo-path
...
Use the correct path when building the FileInfo for the search result
2014-07-14 21:32:17 +02:00
73e2bf7bf4
fixing PHPDoc
2014-07-14 21:26:47 +02:00
ab2c7e06a4
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
2014-07-14 21:26:37 +02:00
7159d6118e
reduce share action text to the user name only
2014-07-14 21:11:50 +02:00
8f11019f45
mkae getRelativePath of file search results overwriteable in subclasses
2014-07-14 19:27:10 +02:00
eea5c2ee0a
return relative path
2014-07-14 19:12:06 +02:00
c3991ae13e
Use the correct path when building the FileInfo for the search result
2014-07-14 18:32:45 +02:00
9ee1c7ff71
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
2014-07-14 17:10:07 +02:00
4b91741875
Merge pull request #9598 from owncloud/fix-app-installation-master
...
append file extension to the temporary file which contains the downloade...
2014-07-14 17:05:36 +02:00
10a29556b0
- Added test to trigger index id error
...
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes
2014-07-14 16:20:09 +02:00
2ca01c38f3
Merge pull request #9546 from owncloud/user-public
...
Extends the public user api
2014-07-14 15:12:58 +02:00
51d0bdc90c
Expose the user manager in the public server container
2014-07-14 15:10:56 +02:00
20c1ce7f47
Add public interfaces for User, UserManager and UserSession
2014-07-14 15:10:51 +02:00
05ba9b3c64
Merge pull request #9539 from enoch85/patch-1
...
Fix for #9422
2014-07-14 12:58:23 +02:00
45c3a948b9
Merge pull request #9572 from owncloud/deleteunsharetooltip
...
mountType attribute + delete hint fix
2014-07-14 11:50:19 +02:00
8cad574379
Merge pull request #9605 from owncloud/sftp-missing-streamwrapper
...
Re-add missing sftp:// stream wrapper
2014-07-14 11:45:35 +02:00
dd7529da98
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.
2014-07-14 10:36:04 +02:00
e58dce2ee0
Merge pull request #9571 from owncloud/fix_appstore_update_issue
...
Fix update to button issue
2014-07-14 10:00:39 +02:00
5dd76b510f
[tx-robot] updated from transifex
2014-07-14 01:54:27 -04:00
ec3224aab9
Merge pull request #9563 from owncloud/version-delete-cache
...
Remove deleted versions from the cache
2014-07-13 18:14:14 +02:00
d7b8e3209b
[tx-robot] updated from transifex
2014-07-13 01:54:35 -04:00
d02604b3fb
Add short description explaining how SFTP ext storage class works.
2014-07-12 13:58:49 +02:00
c8024934c0
The file providing the sftp:// scheme needs to be included manually.
2014-07-12 13:57:27 +02:00
c1e95d62ec
[tx-robot] updated from transifex
2014-07-12 01:54:39 -04:00
Stephan Peijnik
Björn Schießle
Jenkins for ownCloud
Thomas Müller
blizzz
Jörn Friedrich Dreyer
icewind1991
Vincent Petry
Lukas Reschke
DeLtAfOx
Jan-Christoph Borchardt
Morris Jobke
Philippe Jung
Robin Appelman
Andreas Fischer