Thomas Müller
3babcd0344
Merge pull request #16339 from owncloud/master-override-channel
...
Allow change update channel via public API
2015-05-26 11:42:41 +02:00
Jenkins for ownCloud
fe610a65d3
[tx-robot] updated from transifex
2015-05-25 01:55:06 -04:00
Jenkins for ownCloud
06934e7c00
[tx-robot] updated from transifex
2015-05-24 01:55:03 -04:00
Jenkins for ownCloud
e189435499
[tx-robot] updated from transifex
2015-05-23 01:55:05 -04:00
Vincent Petry
ce34edacfa
Merge pull request #16526 from owncloud/enc_fix_versions_webdav_upload
...
remove part file extension before we read a filekey
2015-05-22 16:42:52 +02:00
Bjoern Schiessle
fef75e5417
remove part file extension before we read a filekey to reuse a existing key if possible, otherwise stuff like versioning will break
2015-05-22 12:12:31 +02:00
Vincent Petry
b82d902e18
Merge pull request #16493 from owncloud/cache-movewithcorrectmimetype
...
Get correct mimetype when moving and changing extension
2015-05-22 11:37:11 +02:00
Joas Schilling
d7b2bc9e2f
Merge pull request #16516 from owncloud/fix-phpdoc-trait
...
Fix PHPDoc
2015-05-22 09:47:59 +02:00
Jenkins for ownCloud
156881efce
[tx-robot] updated from transifex
2015-05-22 01:55:04 -04:00
Lukas Reschke
3d8ea96e55
Fix PHPDoc
...
Use correct parameters
2015-05-22 00:17:38 +02:00
Lukas Reschke
94077caea9
Merge pull request #16499 from owncloud/fix-phpdoc-annotations
...
Fix PHPDoc 🙈
2015-05-21 13:54:01 +02:00
Lukas Reschke
694d639f94
Fix PHPDoc 🙈
...
*sigh*
2015-05-21 13:07:54 +02:00
Vincent Petry
22968e806c
Get correct mimetype when moving and changing extension
...
Fixes issue when restoring folders from trash cross-storage, as such
folders have an extension ".d12345678".
Fixes issue when moving folders between storages and at the same time
changing their extension.
2015-05-21 10:57:58 +02:00
Joas Schilling
896130b68d
Merge pull request #16473 from owncloud/occ_16221
...
occ option to update all third party apps without disable
2015-05-21 09:47:54 +02:00
Jenkins for ownCloud
42dd40ad80
[tx-robot] updated from transifex
2015-05-21 01:55:57 -04:00
Steffen Lindner
48040c46cb
Skip disable3rdParty Apps
2015-05-20 17:06:00 +02:00
Morris Jobke
39d1e99228
Merge pull request #16322 from owncloud/trash-view
...
dont go trough the view when moving to trash
2015-05-20 14:44:01 +02:00
Vincent Petry
7386257676
Merge pull request #16075 from owncloud/skeleton-copy-delay
...
wait with copying the skeleton untill login and setupfs are done
2015-05-20 13:52:08 +02:00
Jan-Christoph Borchardt
f978474577
Merge pull request #16463 from owncloud/add-support-to-disallow-domains
...
Add support for disallowing domains to the ContentSecurityPolicy
2015-05-20 13:08:11 +02:00
Lukas Reschke
a62190a72d
Add support for disallowing domains to the ContentSecurityPolicy
...
For enhanced security it is important that there is also a way to disallow domains, including the default ones.
With this commit every method gets added a new "disallow" function.
2015-05-20 11:44:37 +02:00
Morris Jobke
1e59be2d2d
Merge pull request #16453 from cmeh/patch-6
...
Clean-up of orthography, grammar
2015-05-20 10:26:42 +02:00
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
Christian Hoffmann
35207ae363
Clean-up of orthography, grammar
...
* Changed "instead to" to "instead of".
* Changed "setup" to "set up" (past participle).
2015-05-19 21:15:22 +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
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
Robin Appelman
9c751f1d87
use copy when doing a crossStorageCopy on the same storage
2015-05-19 14:21:58 +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
Thomas Müller
ad88a7d53d
exception class will be logged as well - helps especially in cases where the message contained is empty - e.g. "message":"OCP\\Files\\NotFoundException: at \/home\/deepdiver\/Development\/ownCloud\/core-autotest\/apps\/provisioning_api\/lib\/users.php#354",
2015-05-19 12:35:22 +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
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
Björn Schießle
1c411baf17
Merge pull request #16412 from owncloud/jknockaert-patch-1
...
fix #16356
2015-05-18 19:26:40 +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
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
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
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
Robin Appelman
077d41a9ce
wait with copying the skeleton untill login and setupfs are done
2015-05-18 12:11:31 +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
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
Bjoern Schiessle
887be709f5
a new approach to display the error message
2015-05-18 10:15:17 +02:00
Vincent Petry
246000f799
Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota
...
Validate the quota value to be a correct value
2015-05-15 18:07:13 +02:00
Joas Schilling
0991c0cc02
Merge pull request #16292 from owncloud/webdav-storage-fireprehooks
...
Fire prehooks when uploading directly to storage
2015-05-15 15:08:27 +02:00
Thomas Müller
937306b416
Merge pull request #16323 from owncloud/enc_webdav_fixes
...
some encryption fixes
2015-05-15 10:38:22 +02:00
