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

2940 commits

Author SHA1 Message Date
Roeland Jago Douma
72c5535492
Extend unit tests 2016-06-07 15:09:26 +02:00
Roeland Jago Douma
2e2ece753f
Fix unit tests 2016-06-07 15:09:25 +02:00
Roeland Jago Douma
7c040c0bf9
Show the path relative to the requesting user 
A share can only be requested by 3 'types' of people

* owner
* initiator
* recipient

So we have to get the path as the current user. Since that is the only
path that has any meaning to the user.
 2016-06-07 15:09:19 +02:00
Robin Appelman
7a0254b15b handle path not being set in shared cache (#24993) 2016-06-06 17:01:55 +02:00
Vincent Petry
2867d7a0f8 Merge pull request #24964 from owncloud/issue-24961-public-upload-unlimited 
Allow public upload when the quota is unlimited
 2016-06-06 11:28:52 +02:00
Jenkins for ownCloud
4234892a60 [tx-robot] updated from transifex 2016-06-04 02:01:18 -04:00
Jenkins for ownCloud
63132483ca [tx-robot] updated from transifex 2016-06-03 02:19:30 -04:00
Joas Schilling
5c8e0596e6
Allow public upload when the quota is unlimited 2016-06-02 15:27:16 +02:00
Jenkins for ownCloud
f9f8fb7bf2 [tx-robot] updated from transifex 2016-06-02 01:55:16 -04:00
Jenkins for ownCloud
b2e524b936 [tx-robot] updated from transifex 2016-05-31 01:54:58 -04:00
Torben Dannhauer
718f0757e4 Fix for #23066 (#24689) 2016-05-31 06:53:28 +02:00
Jenkins for ownCloud
985063a7e2 [tx-robot] updated from transifex 2016-05-30 01:57:01 -04:00
Lukas Reschke
aba539703c
Update license headers 2016-05-26 19:57:24 +02:00
Jenkins for ownCloud
567381e361 [tx-robot] updated from transifex 2016-05-26 01:56:23 -04:00
Joas Schilling
3f0b2d148d
Move tests to PSR-4 2016-05-25 15:00:00 +02:00
Joas Schilling
b72706b450
Move background job to PSR-4 2016-05-25 14:59:59 +02:00
Joas Schilling
3a716ae91c
Move lib/ to PSR-4 2016-05-25 14:59:59 +02:00
Joas Schilling
5001036fd4
Move classes from outside lib/ to PSR-4 2016-05-25 14:59:59 +02:00
Joas Schilling
25f3110730 Fix ShareControllerTest (#24824) 2016-05-25 10:21:07 +02:00
Jenkins for ownCloud
6972f4dc50 [tx-robot] updated from transifex 2016-05-25 02:03:38 -04:00
Jenkins for ownCloud
f1f7511c61 [tx-robot] updated from transifex 2016-05-24 15:24:38 -04:00
Vincent Petry
465cf9fe9b Merge pull request #24346 from lenz1111/fix_24331 
Fix: Bugs in shared link with video #24331
 2016-05-24 13:49:02 +02:00
Piotr Filiciak
df59c5d1ee bug fix 2016-05-24 12:43:43 +02:00
Piotr Filiciak
11b2e98a30 video poster 2016-05-24 12:34:37 +02:00
Vincent Petry
adcf942901 Merge pull request #24750 from owncloud/lenz1111-share_download_range_requests_support 
Http Range requests support in downloads
 2016-05-23 21:01:26 +02:00
Vincent Petry
5ba1add03c Merge pull request #24603 from owncloud/federated_reshare 
flat federated re-share
 2016-05-23 09:52:13 +02:00
Jenkins for ownCloud
357d342467 [tx-robot] updated from transifex 2016-05-23 01:55:10 -04:00
Jenkins for ownCloud
88328000b1 [tx-robot] updated from transifex 2016-05-22 01:56:56 -04:00
Björn Schießle
20852fd8c0
remove reshares and the mapping in the federated_reshares table on unshare from self 2016-05-20 21:15:16 +02:00
Björn Schießle
e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app 2016-05-20 21:15:16 +02:00
Björn Schießle
7b25839bd5
use share initiator as fall back to access the file 
in case of federated re-shares the owner can be a remote user.
Therefore we can't always use to owner to access the local file
 2016-05-20 21:15:15 +02:00
Björn Schießle
81e3787f9c
close cursor after select to avoid db lock 2016-05-20 21:15:11 +02:00
Björn Schießle
d23df4cba7
create re-share by owner and propagate unshare and unshare-from self request 
correctly accross share owner and share initiator
 2016-05-20 21:15:11 +02:00
Björn Schießle
5a1641bed2
move request handler for federated shares to the federated sharing app 2016-05-20 21:15:08 +02:00
Piotr Filiciak
9999e05660
Http Range requests support in downloads 
Http range requests support is required for video preview
 2016-05-20 18:16:44 +02:00
Joas Schilling
320b1c3abf
Fix more failures 2016-05-19 10:11:42 +02:00
Jenkins for ownCloud
7ca5b35379 [tx-robot] updated from transifex 2016-05-19 01:54:58 -04:00
Roeland Douma
5c9103287f Group fixup (#24621) 
* Move used OC_Group_xx to \OC\Group

* Add (deprecated) legacy wrapper in legacy, OC_Group_xx

* Replace deprecated use of OC_Group_xx with \OC\Group\xx
 2016-05-17 16:06:44 +02:00
Jenkins for ownCloud
c24a685ab5 [tx-robot] updated from transifex 2016-05-17 01:54:56 -04:00
Jenkins for ownCloud
bafa02d312 [tx-robot] updated from transifex 2016-05-16 01:54:58 -04:00
Piotr Filiciak
53437ecced Fix: Bugs in shared link with video #24331 2016-05-15 15:41:02 +02:00
Jenkins for ownCloud
7c28f62e20 [tx-robot] updated from transifex 2016-05-15 01:55:34 -04:00
Jenkins for ownCloud
83cd655675 [tx-robot] updated from transifex 2016-05-14 01:56:45 -04:00
Jenkins for ownCloud
cba4875e4d [tx-robot] updated from transifex 2016-05-13 02:08:45 -04: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
Jenkins for ownCloud
c5ae14453a [tx-robot] updated from transifex 2016-05-12 02:08:58 -04:00
Roeland Jago Douma
8bfa532075
Fix test race condition 
E-tag propagation replies on the mtime of the file. Order of events:

1. add file 'foo.txt' with content 'bar'
2. Set mtime to now() - 1
3. Check if etag changed.

Now this goes right often when 1 and 2 happen in the same second.
However imagine

1. add file 'foo.txt' with content 'bar' (at t=0.999)
2. Set mtime to now() - 1 (at t=1.001)

Now the mtime will be set to the same time. Thus not chaning the etag.
 2016-05-11 14:07:37 +02:00
Thomas Müller
199b447527
Yo-ho-oh - Murder all band 'o pirates 2016-05-11 09:16:17 +02:00
Jenkins for ownCloud
10e0fc0629 [tx-robot] updated from transifex 2016-05-09 02:08:23 -04:00
Jenkins for ownCloud
5d35844aff [tx-robot] updated from transifex 2016-05-08 01:54:53 -04:00
Jenkins for ownCloud
956c3f2719 [tx-robot] updated from transifex 2016-05-07 01:54:56 -04:00
Jenkins for ownCloud
6a95af0a4b [tx-robot] updated from transifex 2016-05-06 01:54:56 -04:00
Jenkins for ownCloud
48be0b781a [tx-robot] updated from transifex 2016-05-05 01:55:08 -04:00
Jenkins for ownCloud
cd7f4ed96f [tx-robot] updated from transifex 2016-05-04 02:11:59 -04:00
Morris Jobke
547830d97e Merge pull request #22989 from owncloud/lock_sharing_ops 
Add locking to modifying operation of the OCS Share API
 2016-05-03 10:15:54 +02:00
Roeland Jago Douma
354329acf2
Cleanup Files_Sharing CLASSPATH 
* OC\Files\Cache\SharedScanner
* OC\Files\Cache\Shared_Cache
* OC\Files\Cache\Shared_Permissions
* OC\Files\Cache\Shared_Updater
* OC\Files\Cache\Shared_Watcher
* OCA\Files\Share\Maintainer
* OCA\Files\Share\Proxy
 2016-05-02 16:15:40 +02:00
Roeland Douma
5a62c74495 Merge pull request #24376 from owncloud/remove_dead_code 
Remove dead code
 2016-05-02 09:57:28 +02:00
Roeland Jago Douma
45d618a133
Remove dead code 
Ancient files_sharing updater code I came across.
 2016-05-02 08:20:42 +02:00
Jenkins for ownCloud
a323111bd1 [tx-robot] updated from transifex 2016-05-02 02:08:49 -04:00
Jenkins for ownCloud
ff8980d59c [tx-robot] updated from transifex 2016-05-01 01:55:00 -04:00
Roeland Jago Douma
8a652d1238
Unlock before all returns 2016-04-30 11:34:06 +02:00
Roeland Jago Douma
420b5273b1
There is no need to do old etag propagation 
Etags are calculated differently now and don't require manual updating.
 2016-04-30 10:40:45 +02:00
Roeland Jago Douma
62bc53143e
Add locking to modifying operation of the OCS Share API 
Fixes #17243

This is done in the OCS Share API instead of the share manager since we
want lazy shares in general. However when doing modifying calls via the
OCS Share API it is fine to force real nodes.

* Updated unit tests to work with logging
 2016-04-30 10:32:35 +02:00
Jenkins for ownCloud
023c8b0eac [tx-robot] updated from transifex 2016-04-30 01:55:54 -04:00
Jenkins for ownCloud
1f63e8df61 [tx-robot] updated from transifex 2016-04-29 01:54:56 -04:00
Jenkins for ownCloud
ba0099f73a [tx-robot] updated from transifex 2016-04-28 01:55:14 -04:00
Thomas Müller
887045b790 Merge pull request #24027 from owncloud/translate_ocs_share 
Translate OCS Share API error messages
 2016-04-26 14:42:18 +02:00
Jenkins for ownCloud
14c3491977 [tx-robot] updated from transifex 2016-04-26 04:50:32 -04:00
Robin Appelman
dbfdc6282a
do propagation in a single query 2016-04-25 16:18:59 +02:00
Roeland Jago Douma
5e9b618604
Translate OCS Share API error messages 
For https://github.com/owncloud/core/issues/22209
 2016-04-25 11:08:48 +02:00
Björn Schießle
74de72e75e Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app 
move federated sharing settings to the federatedfilesharing app
 2016-04-25 10:19:46 +02:00
Jenkins for ownCloud
4dc17e4863 [tx-robot] updated from transifex 2016-04-24 01:55:06 -04:00
Jenkins for ownCloud
afce892e9c [tx-robot] updated from transifex 2016-04-23 01:56:02 -04:00
Thomas Müller
a3813c55da Merge pull request #24124 from owncloud/encryped-size-progation 
dont do optimized size propagation for encrypted files
 2016-04-22 15:23:42 +02:00
Björn Schießle
e10105474f
move federated sharing settings to the federatedfilesharing app 2016-04-22 14:55:40 +02:00
Björn Schießle
606b756a94 Merge pull request #23918 from owncloud/cruds-for-federated-shares 
bring back CRUDS permissions for federated shares
 2016-04-22 14:50:42 +02:00
Robin Appelman
b7867e9368 Add unit tests for shared size propagation with encryption 2016-04-21 13:13:18 +02:00
Thomas Müller
1ab27ddd4a Merge pull request #24081 from owncloud/migrate-deprecated-jquery-v1-functions 
migrate deprecated jQuery 1.x functions
 2016-04-20 20:38:38 +02:00
Thomas Müller
cd01c440a0 Merge pull request #23919 from owncloud/cyclyc-share-dep-example 
SharedStorage to new sharing code + cleanup
 2016-04-20 20:37:27 +02:00
Björn Schießle
e906796f99
ask for share-permissions on propfind 2016-04-20 17:47:32 +02:00
Thomas Müller
34b753baa0 Merge pull request #23952 from owncloud/hide-hidden-files 
Add option to hide hidden files
 2016-04-20 11:58:38 +02:00
Christoph Wurst
6c5696d3a8
filter hidden files on the web interface 
add checkbox to toggle show/hide hidden files

persist show hidden setting

fix settings menu layout

test ApiController::showHiddenFiles

don't show hidden files by default

Store config in Backbone model and inject it into FileList

Filter files only temporarily when rending the file list

Fix file rename validation
 2016-04-19 16:08:56 +02:00
Roeland Jago Douma
dd7e0d13e5
Move the group dummy backend to test 
The dummy backend is only used for testing and should thus reside in
tests.
 2016-04-19 15:13:31 +02:00
Christoph Wurst
05d203a989
replace $.parseJSON() by JSON.parse() 2016-04-19 15:06:42 +02:00
Roeland Jago Douma
b53d6598f1
Move moveFromCache to CacheJail 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
f27d7cbf99
Move copy- and moveFromStorage to jail 2016-04-19 14:04:00 +02:00
Robin Appelman
2f1c62ce0b
Only construct the storage when we start using it 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
c98fef8a51
Fix resolve path 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
92abb5f23d
Fix tests 2016-04-19 14:04:00 +02:00
Roeland Jago Douma
6123badbfa
Move SharedStorage et al over to the shareManager and jail 2016-04-19 14:04:00 +02:00
Björn Schießle
d1d80b4f9e
set correct permissions in shareinfo 2016-04-18 12:02:06 +02:00
Roeland Douma
411fac892a On mount make sure multiple shares with same target map to unique ones (#23937) 
Scenario:
user0 shares a folder 'foo' with user2
user1 shares a folder 'foo' with user2
user2 logs in

Before: show only the 'foo' from user1

After: show both.

* Added intergration tests
 2016-04-14 11:50:27 +02:00
Jenkins for ownCloud
a2da7614a0 [tx-robot] updated from transifex 2016-04-13 01:54:59 -04: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
Roeland Jago Douma
db0c3bd535
Fix Share20OCSTest 2016-04-08 15:22:49 +02:00
Jan-Christoph Borchardt
be9b685926 Merge pull request #23444 from owncloud/add-loading-spinner 
Add loading spinner to "Add to owncloud"
 2016-04-07 13:52:34 +02:00
Erik Pellikka
73d5889c5d add loading spinner to add to owncloud input field 
Update public.js

Update public.js
 2016-04-07 04:33:46 -04:00
Jenkins for ownCloud
1576a9a10b [tx-robot] updated from transifex 2016-04-07 01:56:01 -04:00
Roeland Jago Douma
db5ea95e29 Add capability to show if group sharing is enabled 
fixes #23477

Now clients can correct wording to properly reflect who a user can share
with.
 2016-04-04 19:35:01 +02:00
Jenkins for ownCloud
cce6194368 [tx-robot] updated from transifex 2016-04-01 01:56:19 -04:00
Jenkins for ownCloud
82da373ee7 [tx-robot] updated from transifex 2016-03-31 01:55:24 -04:00
Vincent Petry
a9aa39efbf Fix displaying owner before share icon in file list 
Initial display of owner was missing
 2016-03-30 18:09:02 +02:00
Jenkins for ownCloud
dd5bbc31f2 [tx-robot] updated from transifex 2016-03-29 01:55:16 -04:00
Jenkins for ownCloud
a092fe3bf8 [tx-robot] updated from transifex 2016-03-28 01:55:08 -04:00
Jenkins for ownCloud
1079554284 [tx-robot] updated from transifex 2016-03-27 01:55:45 -04:00
Vincent Petry
9ee1f506f2 Return remote shares in oc:share-types Webdav property 
Fixes web UI to properly display the share status icon when an outgoing
remote share exists
 2016-03-24 12:16:57 +01:00
Thomas Müller
61c5717281 Merge pull request #23463 from owncloud/lets-consistently-use-no-referer 
Consistently use rel=noreferrer
 2016-03-23 09:14:54 +01:00
Thomas Müller
d5be21fe81 Merge pull request #23398 from owncloud/block_group_sharing 
Allow blocking of group sharing
 2016-03-22 21:28:13 +01:00
Roeland Jago Douma
00f48ec37b When the Share API is disabled do not return shares 
Fixes #22668

Block everything in the OCS Share API
 2016-03-22 19:43:23 +01:00
Roeland Jago Douma
e69a09756b Respect disabled group sharing in sharee endpoint 
* Fix tests
 2016-03-22 17:13:34 +01:00
Roeland Jago Douma
52826d0e24 Block group sharing in API and in share manager 
* Fix tests
 2016-03-22 17:13:34 +01:00
Thomas Müller
8852fdaee3 Merge pull request #22789 from owncloud/dav-sharesproperty 
Add webdav property for share info in PROPFIND response
 2016-03-21 11:15:00 +01:00
Jenkins for ownCloud
35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Lukas Reschke
6ad957906e Consistently use rel=noreferrer 
When linking to external entities we should consistently use rel=noreferrer
 2016-03-20 15:27:20 +01:00
Jenkins for ownCloud
1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Vincent Petry
f778e48ee5 Add webdav property for share info in PROPFIND response 2016-03-17 15:35:21 +01:00
Thomas Müller
8fb3e44610 Merge pull request #23287 from owncloud/issue-22786-absolute-paths 
Fix absolute path creation for remote shares with /oc webroot
 2016-03-17 14:29:57 +01:00
Thomas Müller
225eebd8f9 Merge pull request #23155 from owncloud/fed-unshare-with 
Specify the target user when unsharing a federated share
 2016-03-16 11:19:09 +01:00
Joas Schilling
140d5f7df3 Make sure to append the web root as per doc 2016-03-16 09:37:48 +01:00
Thomas Müller
d4a8d5d2ea Merge pull request #22998 from owncloud/delay-loading-the-scanner 
Delay check till scanner is used
 2016-03-15 12:16:02 +01:00
Thomas Müller
0f6ea9fd29 Merge pull request #23039 from owncloud/invalid-share-storage 
dont break when there is an invalid share
 2016-03-15 12:15:05 +01:00
Jenkins for ownCloud
2c6617da60 [tx-robot] updated from transifex 2016-03-15 01:55:47 -04:00
Robin Appelman
7d42bdfde0 Specify the target user when unsharing a federated share 2016-03-14 14:34:05 +01:00
Jenkins for ownCloud
e0998c27ff [tx-robot] updated from transifex 2016-03-14 01:56:12 -04:00
Thomas Müller
101e446577 Merge pull request #23091 from owncloud/issue-23085-csae-insensitive-group-search 
Return the correct group casing in sharee api
 2016-03-13 19:51:07 +01:00
Roeland Jago Douma
6509220f82 Fix intergration tests 2016-03-13 13:31:28 +01:00
Roeland Jago Douma
4b1fe0083a Remove the old OCS Share API code 2016-03-13 13:31:28 +01:00
Joas Schilling
aad8aa0970 Correctly lower the search input as well 2016-03-11 14:08:13 +01:00
Joas Schilling
8cd52ed36d Return the correct group casing in sharee api 2016-03-11 14:08:12 +01:00
Robin Appelman
a8db587b1f move failedstorage to core 2016-03-11 13:15:45 +01:00
Robin Appelman
3bd6fc797d dont break when there is an invalid share 2016-03-11 13:15:45 +01:00
Jenkins for ownCloud
1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00
Thomas Müller
b502667f3a Merge pull request #23121 from owncloud/scrutinizer_share_fixes 
Fix some scrutinizer warning in the sharing code
 2016-03-10 22:17:06 +01:00
Roeland Jago Douma
e6712c47a6 Fix some scrutinizer warning in the sharing code 
* Better phpdoc
* Promper use statements
* Unused parameter
 2016-03-10 21:35:22 +01:00
Roeland Jago Douma
517ef52560 Add mimetype to OCS Share API output 
Fixes #23044
 2016-03-10 15:41:17 +01:00
Jenkins for ownCloud
96d70aa270 [tx-robot] updated from transifex 2016-03-10 01:55:35 -05:00
Lukas Reschke
80b91264e1 Delay check till scanner is used 
Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
 2016-03-09 16:01:53 +01:00
Thomas Müller
290a16e5d7 Merge pull request #22930 from owncloud/bugfix-submit-disable-password-length-zero 
Public link share disabled if password length is equal to 0
 2016-03-09 12:22:01 +01:00
Thomas Müller
30cec687ae Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-contents 
Use HTTPClient instead of file_get_contents
 2016-03-09 12:20:06 +01:00
Thomas Müller
3608421800 Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-fun 
Use "hasKey" instead of checking the value
 2016-03-09 12:19:45 +01:00
Jenkins for ownCloud
afe3fdbf49 [tx-robot] updated from transifex 2016-03-09 01:55:42 -05:00
Lukas Reschke
c0200bc5c3 Use "hasKey" instead of checking the value 
If the check is negative it would depending on the used cache store the value as an empty string. When reading the value this check would thus return "false" even if a value exists.
 2016-03-08 23:24:44 +01:00
Lukas Reschke
8214fae9ae Use HTTPClient instead of file_get_contents 
Allows us to catch exceptions like 404's and thus prevents stuff like:

```
{"reqId":"fnmS0hc+fL4+WXKAruo5","remoteAddr":"192.168.39.100","app":"PHP","message":"file_get_contents(http:\/\/ckamm.blaucloud.de\/\/status.php): failed to open stream: HTTP request failed! HTTP\/1.1 404 Not Found\r\n at \/var\/www\/owncloud\/apps\/files_sharing\/lib\/external\/storage.php#260","level":3,"time":"2016-03-08T21:00:33+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/"}
```
 2016-03-08 22:13:00 +01:00
Vincent Petry
e5a107cc45 Fix share mounting recursion 2016-03-08 14:46:42 +01:00
Thomas Müller
2ebf512412 Merge pull request #22915 from owncloud/cleanup_ocs_share_api 
Cleanup OCS Share Api
 2016-03-08 09:41:20 +01:00
Jenkins for ownCloud
a8bafb9bf3 [tx-robot] updated from transifex 2016-03-08 01:55:39 -05:00
prastut
7e52aac771 Public link share disabled if password length is equal to 0 2016-03-08 04:25:35 +05:30
Roeland Jago Douma
b1dae2a4b9 Can't convert node to string 2016-03-07 16:15:01 +01:00
Roeland Jago Douma
218d042142 Move common code to function 
The code to get a share by id is somewhat messy. And was duplicated.
Now this is done is a separate function
 2016-03-07 16:14:57 +01:00
Vincent Petry
dbea268332 Remove "files" arg from download URL in public link page 
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
 2016-03-07 11:55:55 +01:00