5e1865530b
take share target into account when updating recipient etags
2015-06-22 18:21:54 +02:00
5466dcadc0
adding correct blocking logic for fff
2015-06-22 11:42:42 -04:00
5cfcda3e95
Merge pull request #17068 from owncloud/fix_16878
...
fix search for results only from subfolder
2015-06-22 17:55:56 +03:00
45f9083a58
Make an assertion in risky test testGetNodeForPathRoot
2015-06-22 16:49:04 +02:00
738b78f1b0
Use \OC\HintException and translate the hint
2015-06-22 15:34:06 +02:00
9dde482315
remove whitespace on bottom when no search results, fix laylout, fix #16878
2015-06-22 15:30:29 +02:00
3d2ac6dbb6
Use trusted mimetype
...
We shall not use untrusted mimetypes in this context
2015-06-22 15:30:27 +02:00
2b7e5f841a
Merge spliteUserRemote with fixRemoteUrlInShareWith
2015-06-22 15:25:23 +02:00
d38a378b8c
make sure that we split username and server address at the first '@' from the right to allow usernames containing '@'
2015-06-22 15:25:23 +02:00
a88b370dc8
Merge pull request #12546 from oparoz/patch-1
...
Send the mime icon if we can't generate a preview
2015-06-22 13:55:17 +02:00
4d23e06097
Fix undefined offset
...
There are cases where no trusted host is specified such as when installing the instance, this lead to an undefined offset warning in the log right after installing. (when another domain than localhost or 127.0.0.1 was used)
2015-06-22 12:28:07 +02:00
8eda9ae83c
add filter-empty class if no search result in current folder
2015-06-22 12:13:05 +02:00
c74c8eff3a
Enable x-sendfile only if we do not lock the file system
2015-06-22 12:07:53 +02:00
ced15c44b4
Merge pull request #16657 from owncloud/view-emit-path
...
emit hooks from a view as long as the path is inside the default root
2015-06-22 11:29:11 +02:00
7fe5ab4d4a
Merge pull request #17056 from owncloud/appframework-type-cast
...
Allow multiple whitespace in type hints in AppFramework
2015-06-22 10:35:28 +02:00
c77e44117d
[tx-robot] updated from transifex
2015-06-22 01:55:00 -04:00
05fb9ceef9
Merge pull request #17025 from owncloud/sftp-rmdir-emptydir
...
Workaround for empty dir deletion for SFTP
2015-06-21 23:50:58 +01:00
103f8ca6e8
Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm
...
Use proper type
2015-06-21 23:33:19 +01:00
f1e3e25158
AppFramework annotation whitespace unit test
2015-06-21 20:26:57 +01:00
59513ac377
[tx-robot] updated from transifex
2015-06-21 01:55:06 -04:00
04b6f67f07
Allow multiple whitespace in type hints in AppFramework
...
Type hints such as `@param bool $doSomething` will now correctly get
parsed, allowing for alignment of docblock parameters if the app developer so
wishes.
2015-06-20 23:52:01 +01:00
183bd6dd49
[tx-robot] updated from transifex
2015-06-20 01:55:10 -04:00
1ead0b6f95
Use proper type
...
This is a string
2015-06-19 21:00:42 +02:00
00a65e30ce
Request approved state for disabled apps with ocsid
...
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.
With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.
Fixes https://github.com/owncloud/core/issues/17003
2015-06-19 19:04:54 +02:00
ba3b6f9be4
Remove unneeded returns from private cropping methods
2015-06-19 15:07:49 +02:00
5ed9743570
Merge pull request #17041 from owncloud/ocp-since-checker
...
Add tool to check OCP for missing @since tag
2015-06-19 14:40:15 +02:00
ed3dc199ae
remove files_encryption from database at the end of the migration process
2015-06-19 14:15:56 +02:00
5c2646a4bf
Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-upload
...
[master] Verify if path exists
2015-06-19 13:20:38 +02:00
1b7ec7d5ec
Merge pull request #17040 from owncloud/fix-param-naming
...
Fix naming of param in private/server.php
2015-06-19 11:36:40 +02:00
78e581d52a
Merge pull request #17026 from owncloud/update-config.sample.php
...
[config.sample.php] set correct default value for skeletondirectory
2015-06-19 11:10:01 +02:00
fc064212b9
[config.sample.php] set correct default value for skeletondirectory
2015-06-19 11:08:34 +02:00
b230b8e2c6
move the OCPSinceChecker.php to build/
2015-06-19 11:03:09 +02:00
eddbdb8f21
Fix missing @since tags in OCP
2015-06-19 10:51:36 +02:00
ba43ec974c
Add tool to check OCP for missing @since tag
...
* gets executed in autotest.sh and fails if some PHPDoc is missing
* doesn't check classes/methods that are marked as @deprecated
* iterates over all .php files in lib/public
2015-06-19 10:50:48 +02:00
7e046d0595
Fix naming of param in private/server.php
2015-06-19 10:23:04 +02:00
6adddb3095
Merge pull request #16889 from owncloud/group-sorting-fixes
...
Only sort by group name when LDAP is involved
2015-06-19 08:29:25 +02:00
a5eb2f01a9
[tx-robot] updated from transifex
2015-06-19 01:55:29 -04:00
6697f9524c
Merge pull request #16963 from owncloud/fileinfo-lock
...
Acquire read lock when getting file or directory info
2015-06-18 18:27:20 +02:00
0b34d888e6
Merge pull request #17017 from owncloud/cache-update-write-lock
...
update the file cache within the write lock
2015-06-18 18:27:02 +02:00
e15dd783ab
Workaround for empty dir deletion for SFTP
...
Explicitly clear the stat cache after deleting an empty folder to make
sure it is properly detected as deleted in subsequent requests.
This works around a problem with phpseclib where the folder is properly
deleted remotely but the stat cache was not updated.
2015-06-18 17:40:38 +02:00
ebb5523698
Verify if path exists
...
We need to check if the path exists and throw an error instead of handling this situation ungraciously.
2015-06-18 16:48:32 +02:00
17be0993b4
remove unneeded normalize
2015-06-18 15:33:44 +02:00
6018567df2
unlock the file if the file doesnt exists
2015-06-18 15:26:17 +02:00
d7960d5db6
dont update the cache on rename fail
2015-06-18 14:45:13 +02:00
2a50dbd1a1
update noopscanner
2015-06-18 14:42:48 +02:00
7a0917e5b2
Merge pull request #16692 from owncloud/add_social_media_buttons
...
Add social media buttons
2015-06-18 14:41:58 +02:00
3e54696f7f
extends phpdoc
2015-06-18 14:30:25 +02:00
3526b352dc
update the file cache within the write lock
2015-06-18 13:47:03 +02:00
64f0fd0889
Remove unneeded returns from private cropping methods
2015-06-18 13:30:10 +02:00
8193e1d7c1
Move media type icon preview creation to its own method
2015-06-18 13:24:15 +02:00
Robin Appelman
Clark Tomlinson
VicDeo
Joas Schilling
Jan-Christoph Borchardt
Lukas Reschke
Bjoern Schiessle
Björn Schießle
Thomas Müller
Bernhard Posselt
Jenkins for ownCloud
Robin McCorkell
Olivier Paroz
Morris Jobke
Joas Schilling
Vincent Petry