C. Montero Luque
4dda119137
Merge pull request #22865 from owncloud/fix-db-locking-cleanup
...
Run cleanup of expired DB file locks to background job
2016-03-04 15:43:08 -05:00
C. Montero Luque
89315722a1
Merge branch 'master' into autoenable-federation-app
2016-03-04 13:37:42 -05:00
C. Montero Luque
7a0720f300
Merge branch 'master' into fix-db-locking-cleanup
2016-03-04 13:35:04 -05:00
C. Montero Luque
45f49a090a
Merge pull request #22860 from owncloud/trashbin-checkpath
...
Properly check path validity before deleting to trash
2016-03-04 13:33:07 -05:00
Morris Jobke
49b7fc107a
Update error text for link passwords
...
* this removes the old tooltip first before showing
the new one to update the text - otherwise the old
text will be shown
2016-03-04 18:11:42 +01:00
Lukas Reschke
947720b800
Adjust OCS test
2016-03-04 18:00:23 +01:00
Lukas Reschke
1b64982e27
Automatically enable "federation" app
2016-03-04 17:38:51 +01:00
Morris Jobke
138219d74a
Run cleanup of expired DB file locks to background job
...
* fixes #22819
The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.
This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
2016-03-04 15:52:23 +01:00
Thomas Müller
e2642129a1
Merge pull request #22857 from owncloud/add-release-channel-selection
...
Add release channel selection back
2016-03-04 15:29:52 +01:00
Thomas Müller
b56dbd0607
Merge pull request #22816 from owncloud/external-unavailable-recheck
...
allow availability recheck for external storages
2016-03-04 15:29:17 +01:00
Vincent Petry
0eb5292aaf
Properly check path validity before deleting to trash
...
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
2016-03-04 15:27:31 +01:00
Lukas Reschke
63bd6b25db
Cache results of testRemoteUrl
...
Otherwise setting up the storage will result in a HTTP request and thus slowing down ownCloud.
Replaces https://github.com/owncloud/core/pull/22855
2016-03-04 15:13:56 +01:00
Lukas Reschke
e3a0a69c73
Add release channel selection back
...
Allows to select the release channels again and also shows the last check date
2016-03-04 14:37:35 +01:00
Thomas Müller
8be6054e5c
Merge pull request #22851 from owncloud/issue-22849-php54-for-comments
...
ucwords does not support delimiter before 5.4.32
2016-03-04 14:06:25 +01:00
Joas Schilling
98f5423df7
ucwords does not support delimiter on 5.4
2016-03-04 12:13:16 +01:00
Thomas Müller
048e11d25f
Merge pull request #22830 from owncloud/fix_dav_permissions
...
Rename and move permissions are set when a file is updatable
2016-03-04 12:01:32 +01:00
Thomas Müller
533896bd66
Merge pull request #22846 from owncloud/fileactions-downloadspinnerfix
...
Fix download spinner to work with CSS styles
2016-03-04 11:50:49 +01:00
Vincent Petry
3a36163e91
Fix download spinner to work with CSS styles
...
A recent change replaced img elements with CSS icons for file actions.
This fix adjusts the logic to work properly with CSS icons instead of
images.
2016-03-04 10:48:08 +01:00
Jenkins for ownCloud
bcc200cf9b
[tx-robot] updated from transifex
2016-03-04 01:55:53 -05:00
Roeland Jago Douma
3bdafc2122
Rename and move permissions are set when a file is updatable
...
* Fix unit tests
2016-03-03 20:03:06 +01:00
prastut
aa8bdc7f14
trigger login if remember_login checked
2016-03-04 00:22:04 +05:30
Thomas Müller
8d2238e055
Merge pull request #22796 from owncloud/fix-encryption-on-version-restore
...
Keep "encryptedVersion" when calling `\OC\Files\View::copy`
2016-03-03 16:31:11 +01:00
Lukas Reschke
a0df1bb021
Merge pull request #22813 from owncloud/exclude-assets-folder
...
Exclude the assets folder from integrity check
2016-03-03 15:59:57 +01:00
Vincent Petry
4255dd2b39
Properly set exception in FailedStorage
2016-03-03 14:37:23 +01:00
Robin Appelman
6990100e6e
allow availability recheck for external storages
2016-03-03 14:19:34 +01:00
Lukas Reschke
72c8187cbb
Keep "encryptedVersion" when calling `\OC\Files\View::copy`
...
When calling `\OC\Files\View::copy` we should also keep the version to ensure that the file will always have the correct version attached and can be successfully decrypted.
To test this the following steps are necessary (from https://github.com/owncloud/core/issues/22781#issuecomment-191328982 ):
1. setup a new ownCloud 9.0 beta2
2. enable encryption
2. upload a docx (5.7MB large)
3. upload the same file again and overwrite the existing file
4. I can download the original file and the first version
5. I restore the first version
6. restored version can no longer be downloaded with the error described above
The manual cache operation in `\OCA\Files_Versions\Storage` is unfortunately necessary since `\OCA\Files_Versions\Storage::copyFileContents` is not using `\OCP\Files\Storage::moveFromStorage` in the case when an object storage is used. Due to the workaround added in 54cea05271
the stream is directly copied and thus bypassing the FS.
2016-03-03 14:15:36 +01:00
Lukas Reschke
b2bf8f10de
Delete empty file
...
Ref https://github.com/owncloud/core/issues/22803#issuecomment-191749499
2016-03-03 14:04:54 +01:00
Robin Appelman
02635c6f2f
Add locking to the node api
2016-03-03 13:47:00 +01:00
Lukas Reschke
e55c52c078
Exclude the assets folder from integrity check
...
We should not scan the assets folder as this can contain user specific content. Partially addresses https://github.com/owncloud/core/issues/22803
2016-03-03 13:46:41 +01:00
Thomas Müller
4f25f34178
Merge pull request #22778 from owncloud/fix-22770
...
untangle different user manager instances, fixes #22770
2016-03-03 11:55:10 +01:00
Thomas Müller
c590372aef
Merge pull request #22784 from owncloud/files-newmenu-removebrowsercomplete
...
Remove browser autocomplete in new file menu
2016-03-03 11:54:48 +01:00
Thomas Müller
89181b572e
Merge pull request #22799 from owncloud/phil-davis-patch-1
...
Minor grammar in config.sample.php
2016-03-03 11:54:35 +01:00
Thomas Müller
8cacfce83d
ne, or_IN, uz and yo have been removed from transifex and will be removed from git here now as well
2016-03-03 11:29:57 +01:00
Vincent Petry
dbdf2173ac
Return false on 401 in file list + trash file list
...
This gives a chance to the global ajax error handler to do its work if
the session expired.
2016-03-03 09:09:30 +01:00
Jenkins for ownCloud
8b76e8c57b
[tx-robot] updated from transifex
2016-03-03 01:56:04 -05:00
Arthur Schiwon
adf5d111f6
don't hide server not available exception, fixes #20536
2016-03-03 01:15:41 +01:00
Phil Davis
8e70351bda
Minor grammar in config.sample.php
...
Fix this here in the source so it will propogate into the documentation.
Edit was already applied in https://github.com/owncloud/documentation/pull/2208 but needs to be done here at the source.
2016-03-03 04:31:57 +05:45
Vincent Petry
03b90cec35
Fix tooltip for versions mtime
...
It was missing a call to jquery.tooltip
2016-03-02 17:50:46 +01:00
Vincent Petry
5676216e56
Remove browser autocomplete in new file menu
2016-03-02 17:10:29 +01:00
Thomas Müller
a6094b07e3
Merge pull request #22775 from owncloud/issue-22767-federation-fix-missing-translation
...
Translate strings of federation admin section
2016-03-02 16:32:58 +01:00
Thomas Müller
8a23235632
Merge pull request #22776 from RealRancor/versions_config_sample
...
Add Versions app header to config.sample.php
2016-03-02 14:25:44 +01:00
Jenkins for ownCloud
2773b2bb0a
[tx-robot] updated from transifex
2016-03-02 07:40:13 -05:00
Arthur Schiwon
82b55c4db9
untangle different user manager instances, fixes #22770
2016-03-02 13:02:43 +01:00
Joas Schilling
1b3e7ae82b
Translate strings of federation admin section
2016-03-02 12:54:53 +01:00
RealRancor
4a0d91a043
Add Versions app header to config.sample.php
2016-03-02 12:51:04 +01:00
Thomas Müller
6d90651ff0
Merge pull request #22769 from owncloud/increase-version-for-9.1
...
Master is now 9.1
2016-03-02 11:10:45 +01:00
Joas Schilling
8885cb1eb9
Increase all versions on master which is now 9.1
2016-03-02 08:53:42 +01:00
Jenkins for ownCloud
702c1a8962
[tx-robot] updated from transifex
2016-03-02 01:56:33 -05:00
C. Montero Luque
4d69e562a0
Merge pull request #22757 from owncloud/apply-license
...
Update copyright information and author file
2016-03-01 15:36:37 -05:00
C. Montero Luque
12479a1eda
Merge pull request #22756 from owncloud/exclude-custom-data-dir
...
Exclude custom data directory from integrity checker
2016-03-01 15:32:27 -05:00