70eb20e3a7
Merge pull request #17030 from owncloud/lock-posthooks
...
Keep shared lock for post-hooks
2015-06-29 14:17:03 +02:00
c57fb19b2f
Merge pull request #17226 from owncloud/webdav-add-message-on-maintenance
...
In case of maintenance we should add a message to the exception
2015-06-29 14:11:36 +02:00
5810e7ab87
Merge pull request #17050 from owncloud/request-status-from-ocs
...
Request approved state for disabled apps with ocsid
2015-06-29 13:41:11 +02:00
e236e564af
In case of maintenance we should add a message to the exception
2015-06-29 12:31:01 +02:00
aa595392f6
Merge pull request #17217 from owncloud/use-new-updater-url
...
Use new updater URL + add unit tests
2015-06-29 11:27:23 +02:00
733d59ed44
[tx-robot] updated from transifex
2015-06-29 01:54:44 -04:00
04fe9e05f0
Use new updater URL + add unit tests
...
Uses the new updater url "https://updates.owncloud.com/server/ "
2015-06-28 11:25:28 +02:00
4d565a8447
[tx-robot] updated from transifex
2015-06-28 01:55:19 -04:00
a793b98fd0
Fix indentation
2015-06-27 20:37:07 +02:00
af01958f3e
Add missing annotations for parameters
2015-06-27 20:35:47 +02:00
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
708c6268ad
Merge pull request #17206 from oparoz/bpg-media-type
...
Adding BPG media type
2015-06-27 10:19:56 +02:00
28c223edc6
[tx-robot] updated from transifex
2015-06-27 01:55:58 -04:00
158c5b5e47
Adding BPG media type
2015-06-26 19:22:12 +02:00
0684cc15dc
Merge pull request #17071 from owncloud/share-get-users-non-existing
...
fix getUsersSharingFile with locking
2015-06-26 18:27:53 +02:00
271ef9dedb
Remove test-specific method to make Bjoern and Joas happy
2015-06-26 17:37:04 +02:00
c338999032
fix getUsersSharingFile with locking
2015-06-26 16:31:52 +02:00
ac94126393
Merge pull request #17191 from owncloud/issue-17188-group-share-part-file
...
Correctly check if the real file exists, otherwise try the part file
2015-06-26 16:01:41 +02:00
b318b9cf17
Merge pull request #17008 from owncloud/fix-17006
...
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
9b336765b6
Correctly check if the real file exists, otherwise try the part file
2015-06-26 13:17:23 +02:00
796aae4402
Merge pull request #17009 from owncloud/lock-downloadfile
...
Lock file during download
2015-06-26 13:04:34 +02:00
6c3a4282e5
Merge pull request #17165 from owncloud/federated_cloud_sharing_search_address_book
...
Search address book for federated cloud id
2015-06-26 10:53:02 +02:00
b1e29c7dde
[tx-robot] updated from transifex
2015-06-26 01:55:35 -04:00
538e466c30
Keep shared locks in post hooks
...
Instead of unlocking after the file operation, change exclusive locks
back to shared locks during post hooks, and unlock after that.
Also added unit tests to test locking in pre-hooks, during operation and
post-hooks.
2015-06-25 16:33:02 +02:00
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
a288d0eea3
ne need to check twice if $row['share_with'] is set
2015-06-25 12:14:46 +02:00
dd9dfc4461
show nice display name for remote shares if possible
2015-06-25 12:14:03 +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
738b78f1b0
Use \OC\HintException and translate the hint
2015-06-22 15:34:06 +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
Joas Schilling
Morris Jobke
Lukas Reschke
Thomas Müller
Jenkins for ownCloud
Roeland Douma
Olivier Paroz
Vincent Petry
Robin Appelman
Björn Schießle
Joas Schilling
Bjoern Schiessle
Roeland Jago Douma