f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
dddbfb903f
[tx-robot] updated from transifex
2015-06-25 01:55:15 -04:00
58439c337c
Merge pull request #17070 from owncloud/lock-movemountbug
...
Lock correct paths when moving mount
2015-06-24 18:37:48 +02:00
5f59393b30
Merge pull request #17110 from owncloud/share-error-handling
...
[sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:34 +02:00
004280e407
Merge pull request #17136 from rullzer/fix_remove_link_OCS
...
Allow removing of link password in OCS again
2015-06-24 16:45:00 +02:00
8859004a2b
Rollback folder scan if an entry was locked
2015-06-24 15:42:00 +02:00
161ca900e0
Merge pull request #17130 from owncloud/update-mime-types
...
Update wmv and add mts and mt2s
2015-06-24 13:35:58 +02:00
6977eff106
set NULL correctly in password update
...
Old code used 'NULL' but docterine wants null. Now it is possible again
to remove the password from a link share.
2015-06-24 12:37:59 +02:00
300d1c88d0
Merge pull request #17106 from owncloud/htaccess-update-only-once
...
Only update the htaccess ErrorDocument links when they are not set yet
2015-06-24 12:20:22 +02:00
35047a2300
Fix locked paths in the moveMount case
...
When moving a mount point directly, the lock must be applied on the
local mount point path instead of the attached storage root.
Other operations will still lock the attached storage root.
2015-06-24 11:33:28 +02:00
5c213539af
Update wmv and add mts and mt2s - fixes #17128 and owncloud/firewall#107
2015-06-24 11:06:29 +02:00
4f2f8a6f28
[sharing] handle shares of users that aren't available anymore
...
* properly handle the case where an abandoned share is left and
simply skip it
2015-06-23 18:22:36 +02:00
02b2b60581
Merge pull request #17095 from owncloud/proper-error-handling
...
Proper error handling
2015-06-23 17:40:55 +02:00
0db311c9db
Only update the htaccess ErrorDocument links when they are not set yet
2015-06-23 16:45:56 +02:00
c86e129ce9
[updater] keep maintenance active on failure and mark failure in red
2015-06-23 14:45:53 +02:00
cce841c665
Merge pull request #17045 from owncloud/enc_improvements
...
encryption improvements
2015-06-23 14:30:21 +02:00
1ba9fd3ada
[upgrade] print update message before running the update code
...
* otherwise you don't know during which app update something failed
2015-06-23 13:13:44 +02:00
95602d4069
make sure that we always read the header from the original file
2015-06-23 11:41:21 +02:00
fe42553e8a
[updater] propagate error case properly
...
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
2015-06-23 10:03:27 +02:00
fdd01cf15c
Added error message on initMountpoints exception
2015-06-23 09:54:03 +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
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
103f8ca6e8
Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm
...
Use proper type
2015-06-21 23:33:19 +01: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
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
eddbdb8f21
Fix missing @since tags in OCP
2015-06-19 10:51:36 +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
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
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
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
13617a0475
Send the mime icon if we can't generate a preview
2015-06-18 11:35:08 +02:00
c4cb34da9d
[tx-robot] updated from transifex
2015-06-18 01:55:14 -04:00
6856316122
Fix return value for OCP PHPDoc
2015-06-17 15:47:45 +02:00
72eedda16c
use old cache data when locked
2015-06-17 14:13:10 +02:00
24f0151f81
handle locked exceptions when getting file/directory info in sabre
2015-06-17 14:13:10 +02:00
a89bb1d383
Merge pull request #16988 from owncloud/fix-avatar-fail
...
Fix remaining avatar problems
2015-06-17 13:20:29 +02:00
e6e9370eb6
Merge pull request #16985 from owncloud/fix-public-api-phpdoc
...
Fix OCP PHPDoc
2015-06-17 12:04:08 +02:00
70ca0102f5
Fix PHPDoc annotations
2015-06-17 11:57:12 +02:00
Morris Jobke
Jenkins for ownCloud
Vincent Petry
Lukas Reschke
Thomas Müller
Roeland Jago Douma
Joas Schilling
Björn Schießle
Bjoern Schiessle
Bernhard Posselt
Robin McCorkell
Olivier Paroz
Joas Schilling
Robin Appelman