Bjoern Schiessle
4a4cac611f
we don't need to check permissions twice
2016-07-04 10:48:15 +02:00
Lukas Reschke
179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
Bjoern Schiessle
1b74cf72fb
check permissions before rollback
2016-06-30 11:27:25 +02:00
Vincent Petry
f22af90c09
Hide revert button when no permission to revert
2016-06-28 13:00:58 +02:00
Lukas Reschke
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
Vincent Petry
fa3dc909a4
Rollback version must also adjust cached size
2016-06-22 14:16:16 +02:00
Bjoern Schiessle
548b8848ee
no need to mention ownCloud explicitely
2016-06-20 14:46:13 +02:00
Victor Dubiniuk
d82df7e490
Construct path to the version file from the current directory and filename. Fixes #22450
2016-06-02 15:47:12 +02:00
Lukas Reschke
aba539703c
Update license headers
2016-05-26 19:57:24 +02:00
Joas Schilling
eea98f1d74
Background jobs from info.xml ( #24582 )
...
* Move background job registration of Federation to info.xml
* Move background registration of Files app to info.xml
* Move background job registration of files_sharing to info.xml
* Move background job registration of files_trashbin to info.xml
* Move background job registration of files_versions to info.xml
* Move background job registration from user_ldap to info.xml
2016-05-12 10:43:43 +02:00
Joas Schilling
b57f3126eb
Move files_versions to PSR-4 ( #24571 )
2016-05-12 09:49:15 +02:00
Jenkins for ownCloud
6a95af0a4b
[tx-robot] updated from transifex
2016-05-06 01:54:56 -04:00
Joas Schilling
9491d0f65b
Add missing use statement
2016-04-25 13:22:54 +02:00
Jenkins for ownCloud
4dc17e4863
[tx-robot] updated from transifex
2016-04-24 01:55:06 -04:00
Björn Schießle
80959ad95a
Merge pull request #24111 from owncloud/chunk-users-in-background-jobs
...
Chunk the users correctly in the trashbin and versions background job
2016-04-21 14:26:41 +02:00
Joas Schilling
9ebae0bdeb
Chunk the users correctly in the trashbin and versions background job
2016-04-20 10:36:15 +02:00
Roeland Jago Douma
92abb5f23d
Fix tests
2016-04-19 14:04:00 +02:00
Stefan Weil
16df1c5188
apps: Fix typos (found by codespell) ( #23862 )
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 12:52:51 +02:00
Robin Appelman
d0dd76bb8a
set watch policy in test
2016-03-21 13:53:33 +01:00
Thomas Müller
e5b5eca5a9
Merge pull request #22787 from owncloud/versions-fixmtimetooltip
...
Fix tooltip for versions mtime
2016-03-07 14:41:46 +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
Vincent Petry
03b90cec35
Fix tooltip for versions mtime
...
It was missing a call to jquery.tooltip
2016-03-02 17:50:46 +01:00
Joas Schilling
8885cb1eb9
Increase all versions on master which is now 9.1
2016-03-02 08:53:42 +01:00
Lukas Reschke
c353d51810
Remove Scrutinizer Auto Fixer
2016-03-01 17:48:23 +01:00
Lukas Reschke
933f60e314
Update author information
...
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
Jenkins for ownCloud
32f4bea0ae
[tx-robot] updated from transifex
2016-02-25 01:58:06 -05:00
Bjoern Schiessle
4ef035cc61
make sure that the file name doesn't end with a trailing slash. Can for example happen single files shared across servers
2016-02-19 13:15:09 +01:00
Bjoern Schiessle
ac1c3d27b7
get the actual user instead of a federated cloud id
...
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
2016-02-18 10:16:59 +01:00
Thomas Müller
10613f7265
Merge pull request #22273 from owncloud/versions-fixpathasrecipient
...
Fix versions path as share recipient when different than owner path
2016-02-10 17:25:14 +01:00
Vincent Petry
1b9e291913
Use full path of known file when handling versions
...
Instead of relying on the versions API response, use the known file path
when populating version models.
2016-02-10 13:39:25 +01:00
Vincent Petry
a6f997ddae
Remove path from versions response
...
The path attribute contains the path relative to the owner's home
folder, not the one from the recipient, which is useless for the client
and needlessly discloses the owner's original path.
The requested already has access to the full path of the file, so no
need to add it to the response.
2016-02-10 13:38:38 +01:00
Lukas Reschke
762636efcd
Use cache directly instead of QB
...
In case somebody does not use oc_filecache
2016-02-10 12:30:39 +01:00
Lukas Reschke
5ccb9dfa7e
Use database for keeping track of the version
2016-02-09 23:43:27 +01:00
Arthur Schiwon
3a796d1e15
Consolidate getQuota and setQuota methods in User instance
2016-02-09 17:16:43 +01:00
Arthur Schiwon
d2d6644702
use int values and constants instead of strings
2016-02-08 18:16:27 +01:00
Arthur Schiwon
b6e03fe261
versions provide more information when throwing hooks
2016-02-08 16:33:49 +01:00
Robin Appelman
1369f2c684
cleanup shared cache
2016-01-28 11:46:43 +01:00
Thomas Müller
6824704699
Merge pull request #21117 from owncloud/owner-file-exists
...
Only return an owner if the file exists + improved getUidAndFilename
2016-01-15 13:31:56 +01:00
Robin Appelman
5d0451b848
Safe teardowns
2016-01-14 12:54:42 +01:00
Thomas Müller
682821c71e
Happy new year!
2016-01-12 15:02:18 +01:00
Robin Appelman
94200b682c
removed unused imports
2016-01-11 11:40:58 +01:00
Robin Appelman
282f67dad1
improve handling of non existing files in the trashbin
2016-01-11 11:40:58 +01:00
Robin Appelman
300eb54c87
de-deplicate getUidAndFilename
2016-01-11 11:40:58 +01:00
Jenkins for ownCloud
72b34575df
[tx-robot] updated from transifex
2016-01-09 01:55:50 -05:00
Thomas Müller
1cc6fddead
Merge pull request #21498 from owncloud/cleanup-OC_DB
...
Cleanup OC_DB methods
2016-01-07 20:13:16 +01:00
Joas Schilling
ae285c0654
Remove deprecated shipped flag from info.xml which has no use anymore
2016-01-07 15:15:58 +01:00
Joas Schilling
40f786060e
Add ownCloud min and max version for shipped apps
2016-01-07 15:11:49 +01:00
Morris Jobke
547fbfdb76
Remove OC_DB::dropTable
2016-01-07 14:54:54 +01:00
Roeland Jago Douma
4f20e3bac0
Removed deprecated OC_Helper::getSecureMimeType
2015-12-18 13:42:59 +01:00
Thomas Müller
9e97bef935
Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType
...
Use proper public API for OC_Helper::getFileNameMimeType
2015-12-18 10:15:33 +01:00