wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
38351 commits 157 branches 562 tags 714 MiB
Commit graph

829 commits

Author SHA1 Message Date
Nextcloud bot
3bea7ac6ac
[tx-robot] updated from transifex 2016-12-04 01:07:30 +00:00
Nextcloud bot
181cf9c7f3
[tx-robot] updated from transifex 2016-12-03 01:07:26 +00:00
Bjoern Schiessle
edb116ae93
add icon if no versions are available 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2016-12-02 15:45:11 +01:00
Roeland Jago Douma
66a77a8857
Fix js tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-29 20:48:03 +01:00
Roeland Jago Douma
4dcd0474d5
Show mimeicon when versions don't have a preview 
Fixes #2413

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-29 20:35:57 +01:00
Nextcloud bot
8f4ec8583d
[tx-robot] updated from transifex 2016-11-26 01:06:57 +00:00
Nextcloud bot
ba9b17c906
[tx-robot] updated from transifex 2016-11-21 01:06:58 +00:00
Nextcloud bot
97af4f762d
[tx-robot] updated from transifex 2016-11-20 01:06:44 +00:00
Morris Jobke
0e699c4d14 Merge pull request #2116 from nextcloud/downstream-26511 
Display changes in file versions tab view and detailsView
 2016-11-18 11:37:29 +01:00
Lukas Reschke
bc1008ac38
Use 11.0 instead 9.2 
As discussed we're changing the version from 9.2 to 11.0 to make some more sense.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2016-11-15 14:45:58 +01:00
Michael Jobst
96debafd08
Display changes in file versions tab view and detailsView (#26511) 
* Display changes in file versions tab view and detailsView

* versions tab enhancements

enhanced js test file
removed css superscript attribute for version size

* Replaced spaces with tabs
 2016-11-14 15:22:27 +01:00
Nextcloud bot
1d65d31e0f
[tx-robot] updated from transifex 2016-11-12 01:07:11 +00:00
Roeland Jago Douma
55af6b45f7
More tests 
* PreviewController test
* PublicPreview test
* Versions Preview test
* Trash Preview test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Roeland Jago Douma
d720a2fb57
Moved over files_versions 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-11-03 14:00:33 +01:00
Jörn Friedrich Dreyer
f8352fcb8d
introduce callForSeenUsers and countSeenUsers (#26361) 
* introduce callForSeenUsers and countSeenUsers

* add tests

* oracle should support not null on clob

* since 9.2.0
 2016-10-28 08:44:05 +02:00
Nextcloud bot
e23a298a81
[tx-robot] updated from transifex 2016-10-25 09:36:09 +00:00
Joas Schilling
246bb9f33d
Move OC\Files\Storage\Shared to the right namespace 2016-10-20 20:27:44 +02:00
Thomas Müller
c5ca71ee82
[9.2] Register commands in info.xml (#26248) 
* Use DI to load console commands from the apps - class name to be defined in the info.xml

* Load commands from info.xml

* Fix unit test

* Allow Di magic for IMountManager

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2016-10-11 19:48:26 +02:00
skjnldsv
71830b285c Svgo optimization 
Signed-off-by: John Molakvoæ <fremulon@protonmail.com>
 2016-09-27 20:56:26 +02:00
Nextcloud bot
810f72df46
[tx-robot] updated from transifex 2016-09-27 00:09:46 +00:00
Nextcloud bot
b992bf2142
[tx-robot] updated from transifex 2016-09-08 00:10:21 +00:00
Nextcloud bot
1110ef52ed
[tx-robot] updated from transifex 2016-09-07 00:09:25 +00:00
Roeland Jago Douma
798dd40139
Fix getMock files_versions 2016-09-06 09:29:27 +02:00
Joas Schilling
0c73797131
Use live timestamps in the versions tab of the sidebar 2016-09-01 09:02:36 +02:00
Thomas Müller
297d2e48ad
Add occ command to expire the trashbin (#25878) 
* Add occ command to expire the trashbin

* Fix versions folder in setup check
 2016-08-29 14:30:40 +02:00
Roeland Jago Douma
ba4633b165
Add viewBox to app icons 
If we don't add a viewbox a lot of browsers will just say NOPE!!! when
we ask them to scale.
 2016-08-17 15:23:51 +02:00
Jörn Friedrich Dreyer
d59cb04427
Skip version and trash expiry for users that never logged in 2016-08-10 10:51:51 +02:00
Nextcloud bot
2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Joas Schilling
7400ff05ac
Also increase the min version 2016-07-22 14:46:52 +02:00
Robin Appelman
6062b6365b bumb compatible app versions for core apps 2016-07-22 13:04:23 +02:00
Joas Schilling
03cb588ea9 Merge pull request #500 from nextcloud/bump_version 
Bump version
 2016-07-22 10:03:42 +02:00
Joas Schilling
0215b004da
Update with robin 2016-07-21 18:13:58 +02:00
Joas Schilling
813f0a0f40
Fix apps/ 2016-07-21 18:13:57 +02:00
Joas Schilling
86129a8b88
Increase app versions 2016-07-21 15:50:30 +02:00
Nextcloud bot
c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00:00
Robin Appelman
951ff0897c
hint global handlebars 2016-07-08 12:35:33 +02:00
Nextcloud bot
a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Morris Jobke
ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Morris Jobke
5ace43f438 Revert "[tx-robot] updated from transifex" 
This reverts commit 3731b2a006eca1e96d4087212a5e779c85a002e4.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1206161b00bbc28da00aaf80bcd0a3e.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8bac1e.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff45a.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63d2e.

Revert "[tx-robot] updated from transifex"

This reverts commit b0bad03234.
 2016-07-07 11:04:08 +02:00
Nextcloud bot
da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Carlos Damken
d58e6b59d3 Upgrading the log level From Debug to INFO to be consistent with files_trashbin (#25367) 2016-07-06 10:33:31 +02:00
Jenkins for ownCloud
6103df97cc [tx-robot] updated from transifex 2016-07-06 01:56:27 -04:00
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
Morris Jobke
ecdf88e41b Use proper public API for OC_Helper::getFileNameMimeType 2015-12-17 17:07:48 +01:00
Roeland Jago Douma
1f715289bf Removed deprecated function OC_User::deleteUser 
Replaced with proper OCP calls
 2015-12-17 16:18:40 +01:00
Morris Jobke
fb87441fd9 Deduplicate version expire jobs 
* versionSize is calculated anyway in the expire job - > dropped
* offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation
* fixes #21108
 2015-12-10 11:21:28 +01:00
Scrutinizer Auto-Fixer
0f1be1b601 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-12-07 20:08:20 +00:00
Thomas Müller
f9fc254672 Add DB group to some files_external tests 
Adding group Db to federation tests and ldap tests

Add group DB to Test_UrlGenerator

Adding group DB to trashbin and versions tests

Adding group DB to Test_Util_CheckServer for pg
 2015-11-30 10:55:10 +01:00
Thomas Müller
757aa45db7 Adding more DB groups to test suits 
Adding more DB groups to test suits
 2015-11-30 10:55:06 +01:00
Thomas Müller
50f6817ce9 Merge pull request #20439 from owncloud/etag-propagate-in-storage 
Take submount etag into account for folder etags
 2015-11-25 12:49:54 +01:00
Jenkins for ownCloud
eb42340fa3 [tx-robot] updated from transifex 2015-11-21 01:54:59 -05:00