c338999032
fix getUsersSharingFile with locking
2015-06-26 16:31:52 +02:00
796aae4402
Merge pull request #17009 from owncloud/lock-downloadfile
...
Lock file during download
2015-06-26 13:04:34 +02:00
9558562883
Merge pull request #17082 from owncloud/shared-etag-propagate-file
...
Fix etag propagation for single file shares
2015-06-26 12:36:17 +02:00
8cc88fa64f
Merge pull request #17190 from owncloud/lock-changelabel
...
Rename experimental to transactional file locking
2015-06-26 12:27:16 +02:00
eadf789519
Rename experimental to transactional file locking
2015-06-26 11:10:10 +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
569157d529
Merge pull request #17185 from rullzer/fix_17178
...
Fix for #17178
2015-06-26 08:21:32 +02:00
b1e29c7dde
[tx-robot] updated from transifex
2015-06-26 01:55:35 -04:00
27d5838fb7
Fix for #17178
...
If no array of arrays is submitted make sure we still keep $sharedUsers
and $sharedGroups as arrays so the rest of the code keeps functioning as
it should.
2015-06-25 21:16:18 +02:00
0128a86df1
add some docs
2015-06-25 14:29:40 +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
f9dcb559e9
search address book for federated cloud id
2015-06-25 11:57:03 +02:00
9be1d08c3c
Merge pull request #17162 from owncloud/LukasReschke-patch-1
...
Create .htaccess
2015-06-25 11:44:38 +02:00
08984154cd
Create .htaccess
...
Ref https://github.com/owncloud/core/pull/16724#discussion_r33236344 – shouldn't hurt also.
2015-06-25 11:23:11 +02:00
160d8003f8
Merge pull request #17152 from owncloud/LDAP/AD-Typo
...
Ldap/ad typo
2015-06-25 07:56:04 +02:00
dddbfb903f
[tx-robot] updated from transifex
2015-06-25 01:55:15 -04:00
a63f6023fd
Dropped an S from the mouseover
...
We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
2015-06-24 22:10:10 +02:00
58439c337c
Merge pull request #17070 from owncloud/lock-movemountbug
...
Lock correct paths when moving mount
2015-06-24 18:37:48 +02:00
c87ab65081
fix etag propagation for single file shares
2015-06-24 18:16:03 +02:00
f847d9409e
add unit test for single file share etag propagation
2015-06-24 18:16:03 +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
1e7a3a4b3b
Merge pull request #17139 from owncloud/increase-oracle-init-time
...
Let's wait a little longer until oracle finally is available
2015-06-24 16:17:23 +02:00
8859004a2b
Rollback folder scan if an entry was locked
2015-06-24 15:42:00 +02:00
047b7a13a3
Let's wait a little longer until oracle finally is available
2015-06-24 14:09:32 +02:00
7a3cfbc3c8
Merge pull request #17133 from owncloud/rename-user-webdavauth
...
Rename user_webdavauth to prevent accidental activation - refs #17112
2015-06-24 13:57:52 +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
6c3da1ec90
Added unit test to verify link password removeal
2015-06-24 12:38:33 +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
6be0f833d0
Merge pull request #17105 from owncloud/app-content-z-index
...
explicitly set z-index on app-content, fix overlap from navigation
2015-06-24 12:27:29 +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
4da1c84296
Rename user_webdavauth to prevent accidental activation - refs #17112
2015-06-24 12:17:17 +02:00
9e93d1ed25
Merge pull request #17131 from owncloud/non-zero-exit-code-when-app-is-not-compliant
...
Use non-zero exit code when app is not compliant (so CIs can detect t…
2015-06-24 12:06:04 +02:00
e5bc50d156
Use non-zero exit code when app is not compliant (so CIs can detect the status)
2015-06-24 11:59:43 +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
ceb80ac123
[tx-robot] updated from transifex
2015-06-24 01:55:55 -04: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
e01db549a0
Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message
...
adding correct blocking logic for ffw
2015-06-23 15:08:47 +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
71e5bc1803
explicitly set z-index on app-content, fix overlap from navigation
2015-06-23 14:03:27 +02:00
4b5324341c
Merge pull request #17090 from owncloud/upgrade-app-info
...
[upgrade] print update message before running the update code
2015-06-23 13:14:35 +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
e722614639
Merge pull request #17092 from owncloud/fix-language-experimental
...
Accept this language change "at your own risk"
2015-06-23 12:14:11 +02:00
95602d4069
make sure that we always read the header from the original file
2015-06-23 11:41:21 +02:00
e0fb5f4b5e
Accept this language change at your own risk
2015-06-23 10:59:15 +02:00
Robin Appelman
Thomas Müller
Vincent Petry
Morris Jobke
Jenkins for ownCloud
Roeland Jago Douma
Bjoern Schiessle
Lukas Reschke
Joas Schilling
Björn Schießle
Jan-Christoph Borchardt
Jörn Friedrich Dreyer
Joas Schilling