Vincent Petry
61598e7bb5
Merge pull request #9751 from owncloud/issue/9748
...
Fix username for subadmins and only send subadmin groups
2014-07-21 14:22:11 +02:00
Vincent Petry
3df7a83c72
Merge pull request #9406 from philfry/master
...
silently discard the response body, needed for apache/mod_dav and maybe ...
2014-07-21 12:22:06 +02:00
Joas Schilling
0dc67cb1c2
Do not force isAdmin as true and so the list is filtered correctly
2014-07-21 11:30:47 +02:00
Joas Schilling
e6c75aa974
Fix username for subadmins and only send subadmin groups
...
Fix #9748
2014-07-21 11:20:55 +02:00
Jenkins for ownCloud
ddd8eae932
[tx-robot] updated from transifex
2014-07-21 01:54:30 -04:00
Morris Jobke
76a5fa11f5
Merge pull request #9741 from owncloud/fix-repair-innodb-9737-master
...
check if $tables is an array
2014-07-20 21:40:53 +02:00
Andreas Fischer
8cd1f7464e
Merge pull request #9672 from owncloud/mysql-affectedrows
...
Make MySQL affected row count consistent with other DBMSes
* owncloud/mysql-affectedrows:
Added test of OCS privatedata to trigger key duplication
Document why we have to check with defined() first.
Make MySQL return "number of found rows" instead of number of "affected rows".
2014-07-20 21:29:16 +02:00
Morris Jobke
252c239a2a
Merge pull request #9732 from owncloud/fix-9716
...
do not show selected groups twice after user creation
2014-07-20 16:08:39 +02:00
Jenkins for ownCloud
ddc85a9871
[tx-robot] updated from transifex
2014-07-20 01:54:40 -04:00
Thomas Müller
f0c0bd5251
check if $tables is an array
2014-07-19 20:23:38 +02:00
Jenkins for ownCloud
d09ec36751
[tx-robot] updated from transifex
2014-07-19 01:54:42 -04:00
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
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
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
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
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
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