Commit Graph

19710 Commits

Author SHA1 Message Date
Arthur Schiwon 1d39282360 $.unique works only for DOM elements 2014-07-18 21:10:19 +02:00
Vincent Petry 038ba1d05d Merge pull request #9700 from owncloud/ie8-fixes
[OC 7] IE8 styling fixes
2014-07-18 19:27:04 +02:00
Vincent Petry c8a2418815 Merge pull request #9720 from owncloud/sftp-stream-wrapper-new-connection
Pass existing Net_SFTP object into Net_SFTP_Stream.
2014-07-18 19:19:33 +02:00
blizzz 1d520108c5 Merge pull request #9576 from owncloud/bcmath-check
LDAP Active Directory Primary Groups support depends on bcmath module
2014-07-18 19:15:36 +02:00
Vincent Petry f2ea3b5904 Fixed IE8 style issues in files app
- fixed missing scrollbar in personal page
- fixed controls bar transparency: opaque white in IE8
- fixed files table borders in IE8
2014-07-18 17:47:21 +02:00
Andreas Fischer a27753dd80 Pass existing Net_SFTP object into Net_SFTP_Stream. 2014-07-18 15:47:13 +02:00
Bjoern Schiessle b5cb1cfe4e define type in pre hook 2014-07-18 14:34:04 +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
Remco Brenninkmeijer 3ebcc29ee3 Before I get spanked ;) 2014-07-17 21:31:54 +02:00
Thomas Müller 3e58f5df2e Revert "add share index"
This reverts commit e19b3a8794.
2014-07-17 20:56:06 +02:00
Remco Brenninkmeijer d0cd4d5ad9 Adjusted tests for new default sorting 2014-07-17 20:27:55 +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 8231f1ef8c Added test of OCS privatedata to trigger key duplication 2014-07-17 13:18:49 +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
Remco Brenninkmeijer 4f747aaa7a While busy cleaning, also removed extra enters 2014-07-17 13:05:58 +02:00
Remco Brenninkmeijer 616c5b2681 Corrected (Netbeans?) inserted spaces 2014-07-17 12:48:50 +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
Vincent Petry 7a1048956f Fix preview animation on uploading
When adding/uploading files, the preview is now animated.
When loading a list of files directly the preview is displayed directly.
2014-07-17 12:42:09 +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
Remco Brenninkmeijer e307572e8d Fixed comments from PVince81 2014-07-16 22:53:14 +02: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
Remco Brenninkmeijer c8c00d27c4 Cleanup of unnecesary addition 2014-07-16 22:08:03 +02:00
Remco Brenninkmeijer 742589fe01 Show sorting icons when hovering over 2014-07-16 21:52:08 +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
Andreas Fischer d8bd8c4b66 Document why we have to check with defined() first. 2014-07-16 15:13:35 +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
Andreas Fischer e26612244a Make MySQL return "number of found rows" instead of number of "affected rows". 2014-07-16 14:35:47 +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
Robin Appelman 94fa21d146 Add group management to the public api 2014-07-16 14:25:31 +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