Commit graph

24960 commits

Author SHA1 Message Date
Jenkins for ownCloud
c49a06a684 [tx-robot] updated from transifex 2015-05-20 01:56:19 -04:00
Thomas Müller
f9d04f62a8 Merge pull request #16440 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-05-19 22:12:35 +02:00
Thomas Müller
f59576c3ca Merge pull request #16447 from owncloud/fix-minor-code-problems
Fix unexisting class and broken doc
2015-05-19 16:23:36 +02:00
Morris Jobke
d3d70e5d90 Re-add use statement 2015-05-19 16:15:00 +02:00
Joas Schilling
d832c4ae23 Fix unexisting class and broken doc 2015-05-19 15:27:50 +02:00
Thomas Müller
10d1fd1306 Merge pull request #16419 from owncloud/user-group-backend-performance
Reduce the complexity of the search queries in the user/group backends to a minimum
2015-05-19 14:51:13 +02:00
Thomas Müller
12aef31115 Merge pull request #15606 from owncloud/fix-group-list-and-count-primary-group-only
Fixes returns of group memberships and counting if all members have the ...
2015-05-19 14:02:12 +02:00
Scrutinizer Auto-Fixer
fdbc21fc6c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-05-19 11:23:06 +00:00
Arthur Schiwon
76dfc87227 add primary group users to resultset before caching 2015-05-19 12:56:07 +02:00
Arthur Schiwon
6b218039ba Fixes returns of group memberships and counting if all members have the specific groups as primary set. 2015-05-19 12:56:07 +02:00
Thomas Müller
54a6ba47c0 Merge pull request #12401 from owncloud/add-limit-parameter-to-getSharewith
Remove hard coded limit of 15 from getShareWith
2015-05-19 12:40:37 +02:00
Morris Jobke
5f4e0863f5 Merge pull request #16420 from owncloud/update-useconfigtableprefix
Add unit test for migrator with different prefix
2015-05-19 12:19:46 +02:00
Thomas Müller
a52afb040a Merge pull request #15965 from owncloud/conditional-logging
Conditional logging
2015-05-19 12:00:19 +02:00
Thomas Müller
d90b83725f Merge pull request #16085 from owncloud/encryption-module-rename
rename to 'Default encryption module'
2015-05-19 11:13:33 +02:00
Joas Schilling
9e0cb4460e Merge pull request #16354 from owncloud/remove-browser-from-publicwebdav
Show a empty response for GET on non-files instead of the Browser Plugin
2015-05-19 10:54:11 +02:00
Vincent Petry
fabdc4ba9d Add unit test for migrator with different prefix 2015-05-19 10:43:14 +02:00
Morris Jobke
68a593a667 Merge pull request #16181 from owncloud/fix-15982
catch unallowed anonymous auth attempt and show specific error
2015-05-19 10:36:35 +02:00
Morris Jobke
aae9274210 Merge pull request #16293 from owncloud/xcache
Mute XCache error when trying to clear the opcode cache
2015-05-19 09:32:17 +02:00
Morris Jobke
f0e7ae5da8 Merge pull request #16426 from owncloud/add-database-setup-hint
Add hint about additional PHP database modules
2015-05-19 08:30:35 +02:00
Jenkins for ownCloud
313994a33d [tx-robot] updated from transifex 2015-05-19 01:55:35 -04:00
Morris Jobke
176b9674d2 Add hint about additional PHP database modules
* fixes #16391
2015-05-18 22:59:35 +02:00
Björn Schießle
1c411baf17 Merge pull request #16412 from owncloud/jknockaert-patch-1
fix #16356
2015-05-18 19:26:40 +02:00
Arthur Schiwon
cdb0689334 handle unallowed auth exception on port detection 2015-05-18 18:14:05 +02:00
Arthur Schiwon
5a56393657 throw exception on LDAP error 1, which we usually do not see and is pretty generic. AD uses is for uses not enlisted in the RFC, like on issues with anonymous binds. we also try to guess this case and show a hint. 2015-05-18 18:14:05 +02:00
Arthur Schiwon
b9e5309757 catch unallowed anonymous auth attempt and show specific error 2015-05-18 18:14:05 +02:00
Joas Schilling
b085f58553 Merge pull request #16405 from owncloud/enc_add_missing_parameter
add missing parameter to constructor
2015-05-18 17:12:48 +02:00
Clark Tomlinson
f9b6ee86cd Merge pull request #16399 from owncloud/enc_rmdir_fix
[encryption] only try to delete file keys if it is a valid path
2015-05-18 11:09:36 -04:00
Bjoern Schiessle
1c500487ba add a unit test to make sure that we don't try to read a file during a write operation 2015-05-18 17:00:54 +02:00
Joas Schilling
8efc8c0a96 Reduce the complexity of the search queries in the backends to a minimum 2015-05-18 16:39:21 +02:00
Thomas Müller
c28cd03770 Merge pull request #16403 from owncloud/fix-command-loading
Only load commands of enabled apps
2015-05-18 16:16:04 +02:00
Joas Schilling
30d165ebf2 Add missing import for the exception 2015-05-18 15:45:47 +02:00
Joas Schilling
4444db61b7 Add a unit test for the decrypt method 2015-05-18 15:45:11 +02:00
Bjoern Schiessle
7676166254 add l10n to constructor 2015-05-18 15:43:53 +02:00
jknockaert
2834971a77 fix #16356 2015-05-18 15:06:55 +02:00
Björn Schießle
a1e60e7882 Merge pull request #15980 from owncloud/jknockaert-patch-1
fix bug #15973
2015-05-18 15:01:16 +02:00
Vincent Petry
86cf8e1f68 Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
also encrypt files in trash bin
2015-05-18 14:59:34 +02:00
Bjoern Schiessle
7d492fefae also encrypt files in trash bin 2015-05-18 12:51:47 +02:00
Joas Schilling
85f500f070 Merge pull request #16398 from owncloud/fix-php-doc
Fix PHPDoc of public interface ILockingProvider
2015-05-18 12:43:07 +02:00
Morris Jobke
ad3a32edf6 Only load commands of enabled apps 2015-05-18 12:33:56 +02:00
jknockaert
62e6c46216 correct testSeek 2015-05-18 11:55:48 +02:00
Bjoern Schiessle
efa674f10d only try to delete file keys if it is a valid path 2015-05-18 11:54:51 +02:00
Vincent Petry
7e271012b2 Merge pull request #16243 from owncloud/error_if_download_failed
redirect to error page if download failed
2015-05-18 11:42:55 +02:00
Morris Jobke
fc2c9e8f5f Fix PHPDoc of public interface ILockingProvider 2015-05-18 11:37:16 +02:00
jknockaert
9a71eddaf9 work on tests
Tests reorganised and extended
2015-05-18 11:32:29 +02:00
Morris Jobke
7ee3f99a4a Merge pull request #16364 from owncloud/add-warning-webdav
Add notice that WebDAV interface is not intended for browsers
2015-05-18 11:28:47 +02:00
Vincent Petry
d15471abd4 Merge pull request #15738 from rullzer/fix_15611
Fix to make sure expiration date is properly set
2015-05-18 11:26:12 +02:00
Morris Jobke
8543b21d18 Merge pull request #15870 from rullzer/fix_15812
Reset share dialog values - more
2015-05-18 11:24:42 +02:00
Bjoern Schiessle
887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Roeland Jago Douma
b090a32d23 Reset share dialog values so we start out clean
* Unit test
2015-05-18 10:08:09 +02:00
Roeland Jago Douma
efd6fec57d Fix to make sure expiration date is properly set
This did not happen correctly when the password was enforced since a
different code path was taken.

* moved generation of the default date string to separate function
* added unit test
2015-05-18 09:35:47 +02:00