Commit Graph

6899 Commits

Author SHA1 Message Date
Thomas Müller 363ba04f5e only commit in case a transaction is active 2014-07-23 20:13:19 +02:00
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
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
Joas Schilling 01878153e0 Add language parameter to public API for getL10N()
Fix #9756
2014-07-21 14:50:34 +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
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
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
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
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
Robin Appelman 5a0397eb5e Fix renaming files in the root folder of a MappedLocal storage 2014-07-16 21:24:18 +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
Andreas Fischer d8bd8c4b66 Document why we have to check with defined() first. 2014-07-16 15:13:35 +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
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
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
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
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
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
Jörn Friedrich Dreyer 4a855be814 fix logger implementation and test 2014-07-15 10:10:16 +02:00
Jenkins for ownCloud ff11ef3c5b [tx-robot] updated from transifex 2014-07-15 01:55:20 -04:00
Thomas Müller e8f02b9410 Merge pull request #9562 from owncloud/users-groupfilter
Do not filter groups, but therefore update the user counts according to  the filter
2014-07-15 07:40:55 +02:00
Thomas Müller 73e2bf7bf4 fixing PHPDoc 2014-07-14 21:26:47 +02:00
Arthur Schiwon ab2c7e06a4 remove dead code
do not filter groups. but update the user count according to the filter

improve phpdoc

improve metadata runtime cache

add metadata tests
2014-07-14 21:26:37 +02:00
Jörn Friedrich Dreyer 8f11019f45 mkae getRelativePath of file search results overwriteable in subclasses 2014-07-14 19:27:10 +02:00
Jörn Friedrich Dreyer eea5c2ee0a return relative path 2014-07-14 19:12:06 +02:00
Robin Appelman c3991ae13e Use the correct path when building the FileInfo for the search result 2014-07-14 18:32:45 +02:00
Morris Jobke 9ee1c7ff71 Merge pull request #9228 from owncloud/remove-routing-singular-issues
Routing: Dont strip the s from the resource id to prevent possible weird behavior with irregular english plural nouns
2014-07-14 17:10:07 +02:00
Thomas Müller 4b91741875 Merge pull request #9598 from owncloud/fix-app-installation-master
append file extension to the temporary file which contains the downloade...
2014-07-14 17:05:36 +02:00
Vincent Petry 10a29556b0 - Added test to trigger index id error
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes
2014-07-14 16:20:09 +02:00
Robin Appelman 51d0bdc90c Expose the user manager in the public server container 2014-07-14 15:10:56 +02:00
Robin Appelman 20c1ce7f47 Add public interfaces for User, UserManager and UserSession 2014-07-14 15:10:51 +02:00
Björn Schießle 05ba9b3c64 Merge pull request #9539 from enoch85/patch-1
Fix for #9422
2014-07-14 12:58:23 +02:00