248e79c465
Merge pull request #9654 from owncloud/enctest-fileproxydisabledfix
...
Reenable proxies if a test failed to restore it
2014-07-16 16:55:17 +02:00
7a43c623ae
Merge pull request #9653 from owncloud/fix-9590
...
external storage table layout fixes
2014-07-16 16:52:08 +02:00
d58c8d72cf
Merge pull request #9550 from kofemann/dcache-fixes-for-upstream
...
storage: do not check file mode on rename
2014-07-16 16:06:14 +02:00
cbf3e2b829
Merge pull request #9662 from owncloud/enc_error_handling_master
...
[encryption] improved error handling
2014-07-16 15:31:20 +02:00
d8bd8c4b66
Document why we have to check with defined() first.
2014-07-16 15:13:35 +02:00
ec2686db91
Merge pull request #9647 from owncloud/files_external_multiuser_tests
...
Add unit test for multi-user configuration loading
2014-07-16 13:42:12 +01:00
454d8d9362
Merge pull request #9664 from owncloud/enc-removelegacytests
...
[OC8] Removed legacy encryption tests
2014-07-16 14:39:48 +02:00
e26612244a
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-16 14:35:47 +02:00
384be680be
fix CSS coding style
2014-07-16 14:30:58 +02:00
865de19266
Merge pull request #9661 from owncloud/share-ownerdisplaynamefix
...
Correctly return the owner display name for children of shares
2014-07-16 14:25:48 +02:00
94fa21d146
Add group management to the public api
2014-07-16 14:25:31 +02:00
5a33c9c360
Removed legacy encryption tests
2014-07-16 12:38:41 +02:00
8105f2ac8a
introduce some encryption exceptions and catch additional error cases
2014-07-16 12:36:30 +02:00
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
de69c05f99
make sure that the crypt library is loaded
2014-07-16 12:10:52 +02:00
658828867c
Correctly return the owner display name for children of shares
2014-07-16 12:07:02 +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
b2c06354e8
Reenable proxies if a test failed to restore it
2014-07-15 23:05:01 +02:00
934229d1fb
Fix #9590 . Fix #9612 .
...
For external storage with lots of parameter settings (>4), wrap the content of the cell to let a full view of the parameters.
The rows of the table are now always visible until the end (the trash icon is accessible).
(Note : A strange 3px margin forces me to add a class on the row added by javascript, to be able to align them with the rows rendered by the server.)
2014-07-15 22:33:30 +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
483f86513f
Add unit test for multi-user configuration loading
2014-07-15 18:39:09 +01: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
Björn Schießle
Vincent Petry
icewind1991
Andreas Fischer
Robin McCorkell
Morris Jobke
Robin Appelman
Stephan Peijnik
Jenkins for ownCloud
Thomas Müller
Stephane V
blizzz
Jörn Friedrich Dreyer
Lukas Reschke
DeLtAfOx
Jan-Christoph Borchardt
Philippe Jung