Morris Jobke
eb62e7cc27
IUrlGenerator - document linkTo properly
...
* parameter $args was there since 6.0.0
* see 61a9098b7d
2015-04-18 16:03:37 +02:00
Morris Jobke
47ecfd98a3
DB: remove unused parameter - was forgotten during the migration to doctrine
...
* 377e9a8677
<- doctrine merge
2015-04-18 15:57:13 +02:00
Morris Jobke
9ffac12986
IL10n - add PHPDoc for $options
...
* added in #11549
* undocumented in the public interface
2015-04-18 15:50:17 +02:00
Morris Jobke
f72dabb4eb
fix wrong variable names in PHPDoc
2015-04-18 14:31:28 +02:00
Morris Jobke
11f29f6d95
add visibility of methods in server container and interface
2015-04-18 14:19:22 +02:00
Joas Schilling
3f3f8c2f99
Fix usage of deprecated private constants
2015-04-18 10:30:02 +02:00
Joas Schilling
4d238c3949
Fix display name of encryption modules
2015-04-18 10:18:58 +02:00
Joas Schilling
6ce1abfa5c
Deprecate the OC_API constants in favor of the OCP ones
2015-04-18 09:29:52 +02:00
Joas Schilling
4e58f4892a
Move constants to OCP\API so apps can use them
2015-04-18 09:29:51 +02:00
Joas Schilling
8cb0d97b10
Merge pull request #15692 from owncloud/log-exception-type-master
...
Write the type of exception to the log - really helpful for exceptions w...
2015-04-18 09:28:48 +02:00
Joas Schilling
5acda185bd
Correctly prefix OC_API with \ since its not in the namespace
2015-04-18 09:12:42 +02:00
Jenkins for ownCloud
37a871127b
[tx-robot] updated from transifex
2015-04-18 01:55:19 -04:00
Morris Jobke
7ab1f807fb
Merge pull request #15691 from owncloud/vobject-sabre2.1
...
Get rid of the obsolete OC_VObject class
2015-04-17 22:33:00 +02:00
Thomas Müller
d9990c2b4e
Delay initialization of the OC\Encryption\Update - introducing 'OC\Encryption\HookManager'
2015-04-17 13:55:31 +02:00
Thomas Müller
d671f13f26
Write the type of exception to the log - really helpful for exceptions which hold no message
2015-04-17 13:10:10 +02:00
Vincent Petry
b7e5884b54
Get rid of the obsolete OC_VObject class
...
The class isn't needed any more since the update to Sabre 2.1
2015-04-17 12:55:31 +02:00
Bjoern Schiessle
7d4b1b52d0
always create a new instance of the encryption module
2015-04-17 10:31:33 +02:00
Thomas Müller
f32d97750c
Merge pull request #15679 from owncloud/fix-private-member-access
...
Fix private member access of parent class in ocsresponse
2015-04-17 09:13:54 +02:00
Thomas Müller
852cc6f2c6
Merge pull request #15680 from owncloud/add-since-tags-to-public-namespace
...
Add @since tags to all methods in public namespace
2015-04-17 09:13:04 +02:00
Jenkins for ownCloud
da44df2cfa
[tx-robot] updated from transifex
2015-04-17 01:55:37 -04:00
Morris Jobke
7644950b48
Add @since tags to all methods in public namespace
...
* enhance the app development experience - you can look up the
method introduction right inside the code without searching
via git blame
* easier to write apps for multiple versions
2015-04-16 17:00:08 +02:00
Morris Jobke
1d30efdd73
Fix private member access of parent class in ocsresponse
...
* noticed while checking PHPDoc
2015-04-16 16:54:01 +02:00
Clark Tomlinson
1174ad0681
Merge pull request #15445 from owncloud/enc2_migration
...
add migration script from old encryption to new one
2015-04-16 09:34:47 -04:00
Joas Schilling
c7e5e30b86
Merge pull request #15674 from owncloud/fix-console-check-output
...
Convert error and hint to string before writing to the output
2015-04-16 14:51:29 +02:00
Bjoern Schiessle
b25c06f576
detect system wide mount points correctly
2015-04-16 14:15:04 +02:00
Bjoern Schiessle
67500d5f2f
if we start writing a file from the beginning, size should start by zero; result of floor needs to be casted to int in order to compare it with ->size
2015-04-16 14:15:04 +02:00
Bjoern Schiessle
e3d77c4b01
add migration script from old encryption to new one
2015-04-16 14:15:04 +02:00
Thomas Müller
07243f0482
Convert error and hint to string before writing to the output - fixes https://mailman.owncloud.org/pipermail/devel/2015-April/001184.html
2015-04-16 12:32:17 +02:00
Thomas Müller
bcf65d9c13
Using TRANSACTION_READ_COMMITTED
2015-04-16 11:49:12 +02:00
Jörn Friedrich Dreyer
2e06cf49a5
Merge pull request #15623 from t3chguy/master
...
Redis DB Index via Select
2015-04-16 09:30:07 +02:00
Jenkins for ownCloud
8606b7ca66
[tx-robot] updated from transifex
2015-04-16 01:54:43 -04:00
Michael Telatynski
8ebf9de3f8
Memcache\Redis Add DB Select Functionality
2015-04-15 21:24:38 +01:00
Joas Schilling
1592f25ed0
Scale up the font on larger previews
2015-04-15 14:03:40 +02:00
Morris Jobke
e33e5b425a
Merge pull request #12006 from owncloud/dav-put-storage
...
Work directly on the storage when uploading over webdav
2015-04-15 03:08:52 +02:00
Jenkins for ownCloud
7f3f191ee9
[tx-robot] updated from transifex
2015-04-14 18:19:31 -04:00
Thomas Müller
70480423ff
Merge pull request #15597 from oparoz/another-fallback-for-findbinarypath
...
Adding a final fallback for findBinaryPath
2015-04-15 00:16:56 +02:00
Thomas Müller
1aa368effe
Merge pull request #15592 from owncloud/fix-15590-master
...
Avoid php message "Invalid argument supplied for foreach()"
2015-04-15 00:14:08 +02:00
Björn Schießle
4f0437fbde
Merge pull request #15598 from owncloud/fix-enc-file-size-master
...
Fix file size of encrypted files
2015-04-14 16:48:04 +02:00
Robin Appelman
eeecca04e6
Keep phpdoc updated.
2015-04-14 16:25:52 +02:00
Robin Appelman
308af8b909
pass a stream to the tests
2015-04-14 15:25:52 +02:00
Morris Jobke
82cab25762
Merge pull request #13360 from owncloud/cross-storage-move
...
Proper copy/move between multiple local storages
2015-04-14 14:35:08 +02:00
Olivier Paroz
bb0c09e994
Adding a final fallback for findBinaryPath
2015-04-14 14:06:58 +02:00
Thomas Müller
cbe30f740e
remove calculateUnencryptedSize() - not needed
2015-04-14 13:08:59 +02:00
Thomas Müller
967e882757
return size from cache in case the cache entry is marked as encrypted
2015-04-14 13:08:59 +02:00
Thomas Müller
387984a0d5
preserve filesize on rename after upload
2015-04-14 12:27:12 +02:00
Thomas Müller
88cc52c408
Avoid php message "Invalid argument supplied for foreach()" - refs #15590
2015-04-14 11:00:20 +02:00
Morris Jobke
5f66f867b6
Merge pull request #15581 from owncloud/deduplicate-oc-repair-namespace
...
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 21:51:38 +02:00
Morris Jobke
9eff199a17
Merge pull request #15360 from owncloud/cross-storage-move-cache
...
Preserve cache data when doing a cross storage move
2015-04-13 21:48:30 +02:00
Robin Appelman
f605c98531
Fix cross storage move with shared storages
2015-04-13 17:10:05 +02:00
Robin Appelman
addfafd9da
Fix moving mount points
2015-04-13 17:10:02 +02:00
Robin Appelman
caadc8cdd9
reuse cache move logic
2015-04-13 17:10:01 +02:00
Robin Appelman
d7b3a1a35a
preserve cache data when doing a cross storage move
2015-04-13 17:10:01 +02:00
Joas Schilling
71de1d58cd
Fix namespace duplication and other issues in repairlegacystorages
2015-04-13 16:34:10 +02:00
Thomas Müller
660aa7ff1e
Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_results
...
cach user folder for file search results
2015-04-13 15:16:07 +02:00
Robin Appelman
c29419e6d7
fix rebase issue
2015-04-13 15:13:03 +02:00
Robin Appelman
0772e3b4c1
Properly handle copy/move failures in cross storage copy/move
2015-04-13 15:13:03 +02:00
Robin Appelman
404773940d
Detect storage full when doing cross storage copy/move
2015-04-13 15:13:03 +02:00
Robin Appelman
d26c6cab90
properly return false if we cant delete the source file
2015-04-13 15:13:03 +02:00
Robin Appelman
c4ec8fbeff
Make getSourcePath accessible for storage wrappers
2015-04-13 15:13:03 +02:00
Robin Appelman
31e94708f8
Improve cross storage copy between local storages
2015-04-13 15:13:02 +02:00
Robin Appelman
8575bb2cb9
Move cross storage copy logic to the storage
2015-04-13 15:13:02 +02:00
Robin Appelman
b302592a64
Small cleanup of rename code
2015-04-13 15:11:03 +02:00
Robin Appelman
2fd44dbde4
rewind and update error message
2015-04-13 14:14:48 +02:00
Robin Appelman
dcfe014103
use our own stream copy instead
2015-04-13 14:13:21 +02:00
Vincent Petry
2822d0579e
Properly add trailing slash to mount point
...
Fixes resolving mount points when shared mount point's target name has
the same prefix as the source name
2015-04-13 12:36:47 +02:00
Jörn Friedrich Dreyer
b717681e3a
cach user folder for file search results
2015-04-13 11:29:10 +02:00
Morris Jobke
c3fbc2b6fd
Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object-ocsclient
...
Prevent php message: "Trying to get property of non-object at /xxx/lib/p...
2015-04-13 10:30:31 +02:00
Thomas Müller
906b6b7337
Prevent php message: "Trying to get property of non-object at /xxx/lib/private/ocsclient.php#282"
2015-04-13 09:43:45 +02:00
Thomas Müller
8450b6aa2d
Properly import used classes
2015-04-13 09:26:30 +02:00
Lukas Reschke
84041a4fa2
Merge pull request #15541 from owncloud/add-reply-to-support
...
Add "Reply-To" support for sharing mails as well as refactor code and add unit-tests
2015-04-12 22:30:35 +02:00
Jens-Christian Fischer
9c95315a9e
clarify the duplication of the $params array
2015-04-12 14:49:18 +02:00
Jens-Christian Fischer
22c6216f5c
don't update identical values
...
The UPDATE oc_filecache statement blindly overwrites identical data.
Databases like Postgres that create a new row on an update
and mark the old one as dead will suffer from the previous
behaviour, as millions of "new" rows are created in the database.
This patch changes the WHERE clause to test for identical
values and not updating if the values in the DB are identical
to the ones being passed.
2015-04-11 18:06:21 +02:00
Lukas Reschke
e3ad99d252
Add "Reply-To" support to sharing mails and refactor code
2015-04-10 17:30:07 +02:00
Lukas Reschke
77afef328d
Merge pull request #15458 from owncloud/web-shell-master
...
Move console application to it's own class - allows reuse in the web shell
2015-04-10 16:33:01 +02:00
Vincent Petry
e512a69a59
Merge pull request #15395 from owncloud/fix-imagepath
...
Fix UrlGenerator::imagePath() for app paths
2015-04-10 16:11:57 +02:00
Thomas Müller
7b2d53603c
Merge pull request #15489 from owncloud/dont_hide_exceptions_master
...
Dont hide exceptions master
2015-04-10 15:49:45 +02:00
Lukas Reschke
a881218fc2
Add "Reply-To" support for mails
2015-04-10 15:05:34 +02:00
Morris Jobke
25dd4ec767
Throw ServerNotAvailableException always
2015-04-10 14:51:21 +02:00
Thomas Müller
a163243e31
Merge pull request #15510 from owncloud/cron-singleuser
...
block cron when in single user mode
2015-04-10 14:38:50 +02:00
Vincent Petry
73afca6207
Catch more exceptions when connecting to remote DAV server
...
Added InvalidArgumentException to catch HTML parsing errors when XML was
expected.
Made convertSabreException more generic to be able to handle more
exception cases.
2015-04-10 12:02:06 +02:00
Thomas Müller
a33edcd2f0
Fix singe user mode on public.php - take two
2015-04-10 11:17:33 +02:00
Jörn Friedrich Dreyer
fafecd1c05
fix cherrypicking
2015-04-10 11:08:24 +02:00
Jörn Friedrich Dreyer
b069f33a72
throw exception when backends don't provide a user instead of creating legacy local storages
2015-04-10 09:12:37 +02:00
Morris Jobke
5626a02d69
throw exception if setup is incomplete
2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer
8964c5068c
do not disclose information, show generic error on login page
...
Conflicts:
core/templates/login.php
lib/base.php
2015-04-10 09:12:37 +02:00
Thomas Müller
f05e19348d
Fix single user check in case no user is logged in
2015-04-09 23:47:24 +02:00
Thomas Müller
5abbf6d5b0
Merge pull request #13920 from owncloud/sharing_no_user_entry_for_group_shares
...
only create a db entry for the user in case of a name conflict on group share
2015-04-09 23:37:02 +02:00
Lukas Reschke
0bad8f644a
Merge pull request #15511 from owncloud/fix-typos
...
Fix typos and some other adjustments
2015-04-09 19:23:27 +02:00
Morris Jobke
de4a81f462
Merge pull request #15517 from owncloud/fixRenameFailDeleteTargetKeepSource
...
fixes #15326
2015-04-09 18:41:18 +02:00
Thomas Müller
f7c906902a
Throw an exception in case checkServer() returns errors
2015-04-09 16:42:34 +02:00
Lukas Reschke
b60d5d3d6f
Merge pull request #14540 from owncloud/windows-setup-check
...
Disallow Windows Server in Server Check
2015-04-09 16:38:11 +02:00
Thomas Müller
890a18e1a6
Introduce own console application class
2015-04-09 16:28:53 +02:00
Robin Appelman
8af106cc75
block webdav in single user mode
2015-04-09 15:56:41 +02:00
Lukas Reschke
0abce86b31
Disallow Windows Server in Server Check
...
Will prevent users from use ownCloud on Windows Server 🙈
2015-04-09 15:56:37 +02:00
Jörn Friedrich Dreyer
8af52e3876
fixes #15326
2015-04-09 15:37:00 +02:00
Björn Schießle
0710db77bc
Merge pull request #13896 from owncloud/share-generatetarget-remove-exclude
...
Dont create exclude list for generating the share target
2015-04-09 14:51:15 +02:00
Robin Appelman
cbcee34eb0
update tests
2015-04-09 14:46:25 +02:00
Thomas Müller
1d9bd3d31e
Merge pull request #15496 from owncloud/enc-check-if-key-exists-before-deleting
...
Check if the key exists, before trying to delete it
2015-04-09 14:45:40 +02:00
Lukas Reschke
ec69f2838c
Fix typos and some other adjustments
2015-04-09 14:09:09 +02:00
Bjoern Schiessle
332ea77865
only create a db entry for the user in case of a name conflict on group share
2015-04-09 11:16:08 +02:00