Jean-Louis Dupond
fc662917e7
Fix remarks in #9848
2014-08-11 09:15:56 +02:00
Jean-Louis Dupond
71f3326035
Fix memberOf detection. Fixes : #9835
2014-07-24 14:18:41 +02:00
blizzz
6c28c9b141
Merge pull request #9718 from owncloud/sftp-early-login
...
SFTP: login() must be called after getServerPublicHostKey().
2014-07-18 13:34:28 +02:00
Jenkins for ownCloud
80983f5853
[tx-robot] updated from transifex
2014-07-18 01:54:43 -04:00
Frank Karlitschek
f92b5a2507
update appstore api url
2014-07-17 21:54:46 -04:00
Thomas Müller
5665686da5
Merge pull request #9691 from owncloud/kill-too-long-index-master
...
Revert add-share-index
2014-07-17 22:40:59 +02:00
Thomas Müller
3e58f5df2e
Revert "add share index"
...
This reverts commit e19b3a8794
.
2014-07-17 20:56:06 +02:00
Thomas Müller
d632b9e58e
Merge pull request #9710 from owncloud/fix-failing-unit-test-on-MapperTestUtility.php-master
...
kill unused require of MapperTestUtility.php
2014-07-17 17:17:58 +02:00
blizzz
e85f078d17
Merge pull request #9705 from owncloud/ie8-userspagefix
...
Fixed JS and CSS issues in users page
2014-07-17 16:42:19 +02:00
Thomas Müller
9ee8c60b5f
kill unused require of MapperTestUtility.php
2014-07-17 16:35:00 +02:00
Vincent Petry
55e6e27771
Merge pull request #9668 from owncloud/enc_fix_folder_move
...
[encryption] update keys recursively if a folder was moved
2014-07-17 13:17:07 +02:00
Vincent Petry
4d5ebe61c4
Fixed JS and CSS issues in users page
...
- Renamed "delete" to "deleteEntry" to make IE8 happy.
- Added missing "svg" class for the "+" button
- Added height to "+" button but was unable to properly align it
2014-07-17 13:13:03 +02:00
Thomas Müller
3e4304e536
Merge pull request #9696 from owncloud/fix-appframework-test-namespaces-master
...
fixing namespace of MapperTestUtility
2014-07-17 12:42:39 +02:00
Thomas Müller
d430e743b3
fixing namespace of MapperTestUtility
...
and rename file to be lowercase
2014-07-17 11:22:27 +02:00
Bjoern Schiessle
78b13de4bf
check that the file proxies are enabled after each test
2014-07-17 11:22:22 +02:00
Bjoern Schiessle
6e447b6724
update keys recursively if a folder was moved
2014-07-17 11:22:22 +02:00
Thomas Müller
5922689276
Merge pull request #9694 from owncloud/fix-failing-tests
...
fix syntax
2014-07-17 10:56:47 +02:00
Morris Jobke
6cf6c21740
fix syntax
2014-07-17 09:51:44 +02:00
Vincent Petry
77d6d11b91
Merge pull request #9682 from owncloud/mappedlocal-rename
...
Fix renaming files in the root folder of a MappedLocal storage
2014-07-17 09:19:17 +02:00
Jenkins for ownCloud
b736864e78
[tx-robot] updated from transifex
2014-07-17 01:55:09 -04:00
Morris Jobke
da160a5a3e
Merge pull request #9517 from brantje/Add-webapp-meta-tags
...
Add webapp support
2014-07-16 22:44:00 +02:00
Robin Appelman
5a0397eb5e
Fix renaming files in the root folder of a MappedLocal storage
2014-07-16 21:24:18 +02:00
Björn Schießle
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
Vincent Petry
7a43c623ae
Merge pull request #9653 from owncloud/fix-9590
...
external storage table layout fixes
2014-07-16 16:52:08 +02:00
icewind1991
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
Björn Schießle
cbf3e2b829
Merge pull request #9662 from owncloud/enc_error_handling_master
...
[encryption] improved error handling
2014-07-16 15:31:20 +02:00
Robin McCorkell
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
Morris Jobke
454d8d9362
Merge pull request #9664 from owncloud/enc-removelegacytests
...
[OC8] Removed legacy encryption tests
2014-07-16 14:39:48 +02:00
Morris Jobke
384be680be
fix CSS coding style
2014-07-16 14:30:58 +02:00
Morris Jobke
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
Vincent Petry
5a33c9c360
Removed legacy encryption tests
2014-07-16 12:38:41 +02:00
Bjoern Schiessle
8105f2ac8a
introduce some encryption exceptions and catch additional error cases
2014-07-16 12:36:30 +02:00
Stephan Peijnik
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
Bjoern Schiessle
de69c05f99
make sure that the crypt library is loaded
2014-07-16 12:10:52 +02:00
Vincent Petry
658828867c
Correctly return the owner display name for children of shares
2014-07-16 12:07:02 +02:00
Björn Schießle
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
Jenkins for ownCloud
0155326227
[tx-robot] updated from transifex
2014-07-16 01:55:55 -04:00
Thomas Müller
0f9b22107b
Merge pull request #9644 from owncloud/fix_user_api
...
Fix user api
2014-07-15 23:57:02 +02:00
Vincent Petry
b2c06354e8
Reenable proxies if a test failed to restore it
2014-07-15 23:05:01 +02:00
Stephane V
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
blizzz
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
Robin McCorkell
483f86513f
Add unit test for multi-user configuration loading
2014-07-15 18:39:09 +01:00
blizzz
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
Bjoern Schiessle
6967d328e2
make sure that 'OC_Theme' exists before checking if the method exists
2014-07-15 17:48:25 +02:00
Jörn Friedrich Dreyer
818929274d
use UserSession service to resolve user id
2014-07-15 17:42:17 +02:00
Jörn Friedrich Dreyer
b3106c321c
use correct IUser in interface
2014-07-15 17:41:44 +02:00
icewind1991
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
Vincent Petry
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
icewind1991
61b5a770e4
Merge pull request #9561 from libasys/patch-3
...
Fix Error undefined index: file_target
2014-07-15 16:54:57 +02:00
Thomas Müller
6c93bcc814
Merge pull request #9621 from owncloud/fix_logger_implementation
...
fix logger implementation
2014-07-15 16:05:15 +02:00