677c0288fb
Merge pull request #9757 from owncloud/issue/9756
...
Add language parameter to public API for getL10N()
2014-07-21 16:50:48 +02:00
764e695cb6
use the minimum of configured session_livetime and session.gc_maxlifetime for session hearbeat interval calculation
2014-07-21 15:39:46 +02:00
1173a55ddb
Merge pull request #9755 from owncloud/fix-webdav-attribute-permissions-master
...
perm -> permissions
2014-07-21 15:18:40 +02:00
4fea521102
Fix enforced share expiration date to be based on share time
2014-07-21 15:01:20 +02:00
01878153e0
Add language parameter to public API for getL10N()
...
Fix #9756
2014-07-21 14:50:34 +02:00
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
0a9e0d1051
perm -> permissions
2014-07-21 13:49:22 +02:00
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
0dc67cb1c2
Do not force isAdmin as true and so the list is filtered correctly
2014-07-21 11:30:47 +02:00
e6c75aa974
Fix username for subadmins and only send subadmin groups
...
Fix #9748
2014-07-21 11:20:55 +02:00
c84c1f519f
Correctly use groups parameter only when its not empty
...
Fix #9745
2014-07-21 10:46:21 +02:00
ddd8eae932
[tx-robot] updated from transifex
2014-07-21 01:54:30 -04:00
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
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
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
ddc85a9871
[tx-robot] updated from transifex
2014-07-20 01:54:40 -04:00
f0c0bd5251
check if $tables is an array
2014-07-19 20:23:38 +02:00
1c16d012ab
Remove uneeded `strip_tags`
...
This `strip_tags` seems to be completely unneeded and will cause problems with passwords containing stripped characters. (e.g. `<` or `>`)
Needs https://github.com/owncloud/core/pull/9735 to be merged first.
2014-07-19 10:17:24 +02:00
d09ec36751
[tx-robot] updated from transifex
2014-07-19 01:54:42 -04:00
bfd59bddf4
Extract Auth Header logic into new function handleAuthHeaders().
2014-07-19 02:21:18 +02:00
fafed17c60
Deduplicate user/password extraction from alternative HTTP headers.
2014-07-19 02:06:37 +02:00
1d39282360
$.unique works only for DOM elements
2014-07-18 21:10:19 +02:00
038ba1d05d
Merge pull request #9700 from owncloud/ie8-fixes
...
[OC 7] IE8 styling fixes
2014-07-18 19:27:04 +02:00
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
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
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
a27753dd80
Pass existing Net_SFTP object into Net_SFTP_Stream.
2014-07-18 15:47:13 +02:00
b5cb1cfe4e
define type in pre hook
2014-07-18 14:34:04 +02:00
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
80983f5853
[tx-robot] updated from transifex
2014-07-18 01:54:43 -04:00
f92b5a2507
update appstore api url
2014-07-17 21:54:46 -04:00
5665686da5
Merge pull request #9691 from owncloud/kill-too-long-index-master
...
Revert add-share-index
2014-07-17 22:40:59 +02:00
3ebcc29ee3
Before I get spanked ;)
2014-07-17 21:31:54 +02:00
3e58f5df2e
Revert "add share index"
...
This reverts commit e19b3a8794
2014-07-17 20:56:06 +02:00
d0cd4d5ad9
Adjusted tests for new default sorting
2014-07-17 20:27:55 +02:00
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
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
9ee8c60b5f
kill unused require of MapperTestUtility.php
2014-07-17 16:35:00 +02:00
8231f1ef8c
Added test of OCS privatedata to trigger key duplication
2014-07-17 13:18:49 +02:00
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
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
4f747aaa7a
While busy cleaning, also removed extra enters
2014-07-17 13:05:58 +02:00
616c5b2681
Corrected (Netbeans?) inserted spaces
2014-07-17 12:48:50 +02:00
3e4304e536
Merge pull request #9696 from owncloud/fix-appframework-test-namespaces-master
...
fixing namespace of MapperTestUtility
2014-07-17 12:42:39 +02:00
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
d430e743b3
fixing namespace of MapperTestUtility
...
and rename file to be lowercase
2014-07-17 11:22:27 +02:00
78b13de4bf
check that the file proxies are enabled after each test
2014-07-17 11:22:22 +02:00
6e447b6724
update keys recursively if a folder was moved
2014-07-17 11:22:22 +02:00
5922689276
Merge pull request #9694 from owncloud/fix-failing-tests
...
fix syntax
2014-07-17 10:56:47 +02:00
6cf6c21740
fix syntax
2014-07-17 09:51:44 +02:00
Joas Schilling
Matthias Rieber
Morris Jobke
Vincent Petry
Thomas Müller
Jenkins for ownCloud
Andreas Fischer
Lukas Reschke
Arthur Schiwon
Bjoern Schiessle
Frank Karlitschek
Remco Brenninkmeijer