Commit Graph

19533 Commits

Author SHA1 Message Date
Sander 4e2954673a Revert change 2014-07-22 19:45:01 +02:00
Sander eacdf26cde Allow getAppFolder to get another apps path
cc @Raydiation
2014-07-22 16:07:43 +02:00
Thomas Müller 0567fd031f Merge pull request #9772 from owncloud/fix-chunked-upload-master-2
adding special handling of checkPrecondition() for chunked upload
2014-07-22 15:47:55 +02:00
Thomas Müller 8ed6adaf85 Merge pull request #9738 from owncloud/remove-uneeded-strip
Remove uneeded strip_tags
2014-07-22 15:06:23 +02:00
Thomas Müller 31149fb1c3 adding special handling of checkPrecondition() for chunked upload 2014-07-22 13:06:20 +02:00
Vincent Petry 5565eabb81 Merge pull request #9683 from owncloud/fix_#8819_sorting
Fix #8819 sorting
2014-07-22 10:11:00 +02:00
Jenkins for ownCloud 5696a88fc3 [tx-robot] updated from transifex 2014-07-22 01:54:29 -04:00
Remco Brenninkmeijer 319caa7089 Sorting triangles pointing up for ascending, down for descending 2014-07-21 23:07:52 +02:00
Vincent Petry 675e3eec32 Merge pull request #9750 from owncloud/issue/9745
Correctly use groups parameter only when its not empty
2014-07-21 20:45:24 +02:00
Joas Schilling 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
Matthias Rieber 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
Morris Jobke 1173a55ddb Merge pull request #9755 from owncloud/fix-webdav-attribute-permissions-master
perm -> permissions
2014-07-21 15:18:40 +02:00
Joas Schilling 01878153e0 Add language parameter to public API for getL10N()
Fix #9756
2014-07-21 14:50:34 +02:00
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
Thomas Müller 0a9e0d1051 perm -> permissions 2014-07-21 13:49:22 +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
Joas Schilling c84c1f519f Correctly use groups parameter only when its not empty
Fix #9745
2014-07-21 10:46:21 +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
Lukas Reschke 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
Jenkins for ownCloud d09ec36751 [tx-robot] updated from transifex 2014-07-19 01:54:42 -04:00
Andreas Fischer bfd59bddf4 Extract Auth Header logic into new function handleAuthHeaders(). 2014-07-19 02:21:18 +02:00
Andreas Fischer fafed17c60 Deduplicate user/password extraction from alternative HTTP headers. 2014-07-19 02:06:37 +02: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
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