179a355b2c
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-07-01 11:36:35 +02:00
2b0f053126
[tx-robot] updated from transifex
2016-06-29 05:52:18 -04:00
2a72eff9ee
Fix getting the certificate bundle for dav external storage ( #25274 )
...
* Fix getting the certificate bundle for dav external storages
* Log the original exception in dav external storage
2016-06-27 22:26:43 +02:00
88ef163276
handle unavailable fed shares while testing for availability ( #25277 )
...
* More explicit http status codes
* handle unavailable fed shares while testing for availability
2016-06-27 21:34:28 +02:00
6670d37658
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-27 18:23:00 +02:00
7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
2016-06-26 12:55:05 +02:00
955635c7aa
Add explicit delete permission to link shares
...
Link shares always allowed deletion, however internally the permissions
were stored as 7 which lacked delete permissions. This created an
inconsistency in the Webdav permissions.
This fix makes sure we include delete permissions in the share
permissions, which now become 15.
In case a client is still passing 7 for legacy reasons, it gets
converted automatically to 15.
2016-06-24 09:48:48 +02:00
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests
2016-06-22 10:29:40 +02:00
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable
2016-06-22 10:29:40 +02:00
b85bcccc09
[tx-robot] updated from transifex
2016-06-22 01:54:55 -04:00
f2f1eab7f4
fix broken unit test ( #25198 )
2016-06-21 13:55:11 +02:00
ca168265ef
Filter out group shares for owner where owner is included ( #25190 )
2016-06-21 11:36:28 +02:00
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
2016-06-21 11:18:22 +02:00
bb465a7ab4
Catch exceptions while creating shared mounts ( #25077 )
2016-06-20 22:11:05 +02:00
c1770d746d
Merge pull request #25159 from owncloud/share-app-initorder
...
Delay files_sharing's registerMountProviders
2016-06-20 13:31:36 +02:00
a636078e6c
Make getShareFolder use given view instead of static FS
2016-06-17 11:11:59 +02:00
a13caa0ea2
Delay files_sharing's registerMountProviders
...
This moves registerMountProviders until after the sharing backends were
registered. In some situations registerMountProviders will trigger
listeners which might require filesystem access which itself would
mount shares, which itself requires the sharing backends to be
initialized.
2016-06-17 11:00:09 +02:00
4f02bd1dff
disable cleanFolder for the federated share storage
2016-06-14 17:29:09 +02:00
5887afbb37
[tx-robot] updated from transifex
2016-06-14 08:02:15 +02:00
01f8434a75
Merge pull request #57 from nextcloud/fdrop-template
...
smaller files drop fixes
2016-06-13 00:14:34 +02:00
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611
2016-06-11 15:34:43 +02:00
ca43c49709
smaller files drop fixes
...
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
2016-06-11 15:15:37 +02:00
842cc2a788
Merge pull request #19 from nextcloud/files-drop
...
add "hide file list" option
2016-06-10 18:29:09 +02:00
14fde6650c
Merge pull request #25003 from owncloud/fix_ocs_path_response
...
Fix OCS Share API path response
2016-06-10 16:49:50 +02:00
54e2ac5713
Add text about uploaded files
2016-06-10 14:47:40 +02:00
e8a66f8e7d
[tx-robot] updated from transifex
2016-06-10 05:55:19 +00:00
c49402d266
Add some error handling
2016-06-09 21:44:54 +02:00
c268ad1597
Add PHP unit test
2016-06-09 18:29:13 +02:00
e878e786e0
Fix public upload for normal shares
2016-06-09 18:12:58 +02:00
6e99b0f59d
Make uploading possible via select and cleanup CSS
2016-06-09 17:55:26 +02:00
5fdde426eb
Add fancy layout
2016-06-09 17:55:26 +02:00
53ba111e21
Fix XSS
2016-06-09 15:15:17 +02:00
075bf73c80
Prevent access to shareinfo if share if read-only
2016-06-09 15:15:17 +02:00
bb54ab0db8
add hide file list option
2016-06-09 15:15:17 +02:00
b0dd0634e3
Bring back sharedstorage hooks
2016-06-09 14:00:02 +02:00
e7a55c4fef
handle path not being set in shared cache ( #24993 )
2016-06-09 13:59:59 +02:00
355f50bd6c
[tx-robot] updated from transifex
2016-06-09 06:16:41 +00:00
4a3c67fdb4
Bring back sharedstorage hooks
2016-06-08 08:19:32 +02:00
72c5535492
Extend unit tests
2016-06-07 15:09:26 +02:00
2e2ece753f
Fix unit tests
2016-06-07 15:09:25 +02:00
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
7a0254b15b
handle path not being set in shared cache ( #24993 )
2016-06-06 17:01:55 +02:00
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
4234892a60
[tx-robot] updated from transifex
2016-06-04 02:01:18 -04:00
63132483ca
[tx-robot] updated from transifex
2016-06-03 02:19:30 -04:00
5c8e0596e6
Allow public upload when the quota is unlimited
2016-06-02 15:27:16 +02:00
f9f8fb7bf2
[tx-robot] updated from transifex
2016-06-02 01:55:16 -04:00
b2e524b936
[tx-robot] updated from transifex
2016-05-31 01:54:58 -04:00
718f0757e4
Fix for #23066 ( #24689 )
2016-05-31 06:53:28 +02:00
985063a7e2
[tx-robot] updated from transifex
2016-05-30 01:57:01 -04:00
aba539703c
Update license headers
2016-05-26 19:57:24 +02:00
567381e361
[tx-robot] updated from transifex
2016-05-26 01:56:23 -04:00
3f0b2d148d
Move tests to PSR-4
2016-05-25 15:00:00 +02:00
b72706b450
Move background job to PSR-4
2016-05-25 14:59:59 +02:00
3a716ae91c
Move lib/ to PSR-4
2016-05-25 14:59:59 +02:00
5001036fd4
Move classes from outside lib/ to PSR-4
2016-05-25 14:59:59 +02:00
25f3110730
Fix ShareControllerTest ( #24824 )
2016-05-25 10:21:07 +02:00
6972f4dc50
[tx-robot] updated from transifex
2016-05-25 02:03:38 -04:00
f1f7511c61
[tx-robot] updated from transifex
2016-05-24 15:24:38 -04:00
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
df59c5d1ee
bug fix
2016-05-24 12:43:43 +02:00
11b2e98a30
video poster
2016-05-24 12:34:37 +02:00
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
5ba1add03c
Merge pull request #24603 from owncloud/federated_reshare
...
flat federated re-share
2016-05-23 09:52:13 +02:00
357d342467
[tx-robot] updated from transifex
2016-05-23 01:55:10 -04:00
88328000b1
[tx-robot] updated from transifex
2016-05-22 01:56:56 -04:00
20852fd8c0
remove reshares and the mapping in the federated_reshares table on unshare from self
2016-05-20 21:15:16 +02:00
e25fbaf65d
move motifier from the files_sharing app to the federatedfilessharing app
2016-05-20 21:15:16 +02:00
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
81e3787f9c
close cursor after select to avoid db lock
2016-05-20 21:15:11 +02:00
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
5a1641bed2
move request handler for federated shares to the federated sharing app
2016-05-20 21:15:08 +02:00
9999e05660
Http Range requests support in downloads
...
Http range requests support is required for video preview
2016-05-20 18:16:44 +02:00
320b1c3abf
Fix more failures
2016-05-19 10:11:42 +02:00
7ca5b35379
[tx-robot] updated from transifex
2016-05-19 01:54:58 -04:00
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
c24a685ab5
[tx-robot] updated from transifex
2016-05-17 01:54:56 -04:00
bafa02d312
[tx-robot] updated from transifex
2016-05-16 01:54:58 -04:00
53437ecced
Fix: Bugs in shared link with video #24331
2016-05-15 15:41:02 +02:00
7c28f62e20
[tx-robot] updated from transifex
2016-05-15 01:55:34 -04:00
83cd655675
[tx-robot] updated from transifex
2016-05-14 01:56:45 -04:00
cba4875e4d
[tx-robot] updated from transifex
2016-05-13 02:08:45 -04:00
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
c5ae14453a
[tx-robot] updated from transifex
2016-05-12 02:08:58 -04:00
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
199b447527
Yo-ho-oh - Murder all band 'o pirates
2016-05-11 09:16:17 +02:00
10e0fc0629
[tx-robot] updated from transifex
2016-05-09 02:08:23 -04:00
5d35844aff
[tx-robot] updated from transifex
2016-05-08 01:54:53 -04:00
956c3f2719
[tx-robot] updated from transifex
2016-05-07 01:54:56 -04:00
6a95af0a4b
[tx-robot] updated from transifex
2016-05-06 01:54:56 -04:00
48be0b781a
[tx-robot] updated from transifex
2016-05-05 01:55:08 -04:00
cd7f4ed96f
[tx-robot] updated from transifex
2016-05-04 02:11:59 -04:00
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
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
5a62c74495
Merge pull request #24376 from owncloud/remove_dead_code
...
Remove dead code
2016-05-02 09:57:28 +02:00
45d618a133
Remove dead code
...
Ancient files_sharing updater code I came across.
2016-05-02 08:20:42 +02:00
a323111bd1
[tx-robot] updated from transifex
2016-05-02 02:08:49 -04:00
ff8980d59c
[tx-robot] updated from transifex
2016-05-01 01:55:00 -04:00
8a652d1238
Unlock before all returns
2016-04-30 11:34:06 +02:00
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
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
023c8b0eac
[tx-robot] updated from transifex
2016-04-30 01:55:54 -04:00
1f63e8df61
[tx-robot] updated from transifex
2016-04-29 01:54:56 -04:00
ba0099f73a
[tx-robot] updated from transifex
2016-04-28 01:55:14 -04:00
887045b790
Merge pull request #24027 from owncloud/translate_ocs_share
...
Translate OCS Share API error messages
2016-04-26 14:42:18 +02:00
14c3491977
[tx-robot] updated from transifex
2016-04-26 04:50:32 -04:00
dbfdc6282a
do propagation in a single query
2016-04-25 16:18:59 +02:00
5e9b618604
Translate OCS Share API error messages
...
For https://github.com/owncloud/core/issues/22209
2016-04-25 11:08:48 +02:00
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
4dc17e4863
[tx-robot] updated from transifex
2016-04-24 01:55:06 -04:00
afce892e9c
[tx-robot] updated from transifex
2016-04-23 01:56:02 -04:00
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
e10105474f
move federated sharing settings to the federatedfilesharing app
2016-04-22 14:55:40 +02:00
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
b7867e9368
Add unit tests for shared size propagation with encryption
2016-04-21 13:13:18 +02:00
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
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
e906796f99
ask for share-permissions on propfind
2016-04-20 17:47:32 +02:00
34b753baa0
Merge pull request #23952 from owncloud/hide-hidden-files
...
Add option to hide hidden files
2016-04-20 11:58:38 +02:00
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
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
05d203a989
replace $.parseJSON() by JSON.parse()
2016-04-19 15:06:42 +02:00
b53d6598f1
Move moveFromCache to CacheJail
2016-04-19 14:04:00 +02:00
f27d7cbf99
Move copy- and moveFromStorage to jail
2016-04-19 14:04:00 +02:00
2f1c62ce0b
Only construct the storage when we start using it
2016-04-19 14:04:00 +02:00
c98fef8a51
Fix resolve path
2016-04-19 14:04:00 +02:00
92abb5f23d
Fix tests
2016-04-19 14:04:00 +02:00
6123badbfa
Move SharedStorage et al over to the shareManager and jail
2016-04-19 14:04:00 +02:00
d1d80b4f9e
set correct permissions in shareinfo
2016-04-18 12:02:06 +02:00
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
a2da7614a0
[tx-robot] updated from transifex
2016-04-13 01:54:59 -04:00
16df1c5188
apps: Fix typos (found by codespell) ( #23862 )
...
Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-04-12 12:52:51 +02:00
db0c3bd535
Fix Share20OCSTest
2016-04-08 15:22:49 +02:00
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
73d5889c5d
add loading spinner to add to owncloud input field
...
Update public.js
Update public.js
2016-04-07 04:33:46 -04:00
1576a9a10b
[tx-robot] updated from transifex
2016-04-07 01:56:01 -04:00
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
cce6194368
[tx-robot] updated from transifex
2016-04-01 01:56:19 -04:00
82da373ee7
[tx-robot] updated from transifex
2016-03-31 01:55:24 -04:00
a9aa39efbf
Fix displaying owner before share icon in file list
...
Initial display of owner was missing
2016-03-30 18:09:02 +02:00
dd5bbc31f2
[tx-robot] updated from transifex
2016-03-29 01:55:16 -04:00
a092fe3bf8
[tx-robot] updated from transifex
2016-03-28 01:55:08 -04:00
1079554284
[tx-robot] updated from transifex
2016-03-27 01:55:45 -04:00
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
61c5717281
Merge pull request #23463 from owncloud/lets-consistently-use-no-referer
...
Consistently use rel=noreferrer
2016-03-23 09:14:54 +01:00
d5be21fe81
Merge pull request #23398 from owncloud/block_group_sharing
...
Allow blocking of group sharing
2016-03-22 21:28:13 +01:00
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
e69a09756b
Respect disabled group sharing in sharee endpoint
...
* Fix tests
2016-03-22 17:13:34 +01:00
52826d0e24
Block group sharing in API and in share manager
...
* Fix tests
2016-03-22 17:13:34 +01:00
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
Lukas Reschke
Jenkins for ownCloud
Robin Appelman
Vincent Petry
Joas Schilling
Thomas Müller
Robin Appelman
Lukas Reschke
Arthur Schiwon
Bjoern Schiessle
Roeland Jago Douma
Torben Dannhauer
Joas Schilling
Piotr Filiciak
Björn Schießle
Roeland Douma
Roeland Jago Douma
Thomas Müller
Morris Jobke
Christoph Wurst
Christoph Wurst
Stefan Weil
Jan-Christoph Borchardt
Erik Pellikka