Commit graph

3044 commits

Author SHA1 Message Date
Nextcloud bot
2565a39361
[tx-robot] updated from transifex 2016-07-30 00:11:16 +00:00
Jan-Christoph Borchardt
696ff90cbe Merge pull request #625 from nextcloud/video-container-size
up the minimum size of the public share video a bit, use 16/9 ratio
2016-07-29 15:36:30 +02:00
Jan-Christoph Borchardt
748745d381 up the minimum size of the public share video a bit, use 16/9 ratio, fix #603 2016-07-29 10:47:00 +02:00
Nextcloud bot
937577f7bc
[tx-robot] updated from transifex 2016-07-29 00:09:49 +00:00
Nextcloud bot
a20f4c432b
[tx-robot] updated from transifex 2016-07-24 00:09:10 +00:00
Nextcloud bot
e36decc12b
[tx-robot] updated from transifex 2016-07-23 00:09:06 +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
Nextcloud bot
4b4990c48f
[tx-robot] updated from transifex 2016-07-22 00:10:05 +00: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
Morris Jobke
dc5608d15a Merge pull request #477 from nextcloud/fix-layout-public-upload
move closing div to the right place
2016-07-21 09:28:35 +02:00
Nextcloud bot
b7c5a59adf
[tx-robot] updated from transifex 2016-07-21 00:09:07 +00:00
Bjoern Schiessle
1ab1e000e8
move closing div to the right place 2016-07-20 18:34:32 +02:00
Thomas Müller
4d67429cf0
Use an icon to set the email instead of a button with string 2016-07-20 15:07:46 +02:00
Thomas Müller
daaa3ded8d
Add clipboard button to public share link 2016-07-20 15:07:41 +02:00
Nextcloud bot
4a963c21ff
[tx-robot] updated from transifex 2016-07-19 00:09:00 +00:00
Björn Schießle
f7d26e4aa5 Merge pull request #414 from nextcloud/files_sharing_event_dispatcher
Files sharing event dispatcher
2016-07-18 16:10:21 +02:00
Nextcloud bot
b23d3c6418
[tx-robot] updated from transifex 2016-07-18 14:08:51 +00:00
Roeland Jago Douma
773250be24
Cleanup coding style 2016-07-18 13:35:35 +02:00
Roeland Jago Douma
1c5e082ee1
Add eventdispatcher to public link view 2016-07-18 13:35:35 +02:00
Roeland Jago Douma
ea3035aa0e
Move JS inclusion to Controller
* This way we can easier load files conditionally
2016-07-18 13:34:32 +02:00
Roeland Jago Douma
ff54141639
Move SetupFromToken to ShareManager 2016-07-18 10:53:49 +02:00
Morris Jobke
40328114f9 Merge pull request #379 from nextcloud/create_federated_share_on_mount
Create federated share on mount
2016-07-18 09:22:48 +02:00
Nextcloud bot
d6907fe84d
[tx-robot] updated from transifex 2016-07-16 00:09:18 +00:00
Roeland Jago Douma
db559e33be
Fix PHPUnit 5.4 warnings in files_sharing tests 2016-07-15 12:22:53 +02:00
Bjoern Schiessle
c7f6461c53
rename SaveToNextcloudController to MountPublicLinkController 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
56d3100f44
adjust copyright notices 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
dc53788711
remove unused parameter 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
5bbba490c4
move some stuff over to the federatedfilesharing app 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
2f23054b01
s/ownCloud/Nextcloud 2016-07-14 16:39:48 +02:00
Bjoern Schiessle
33a685bc41
continue to accept the URL of the remote server instead of the federated cloud id 2016-07-14 16:39:48 +02:00
Lukas Reschke
813b58ab94 Merge pull request #398 from nextcloud/issue-388-fix-hidden-file-list-master
Fix hidden file list master
2016-07-14 15:37:42 +02:00
Bjoern Schiessle
1394b0afb9
replace 'ownCloud' with 'Nextcloud' 2016-07-14 11:22:35 +02:00
Björn Schießle
f5d0b464a7
create a real federated share if a user add a public link to his ownCloud
this way the owner sees all mounted public links and control them individually
2016-07-14 11:22:35 +02:00
Joas Schilling
76736731eb
Allow shares with create permissions only aswell 2016-07-14 10:27:29 +02:00
Nextcloud bot
a6c23a1f8b
[tx-robot] updated from transifex 2016-07-14 00:09:19 +00:00
Nextcloud bot
afef11f84a
[tx-robot] updated from transifex 2016-07-13 00:09:46 +00:00
Nextcloud bot
e29835a702
[tx-robot] updated from transifex 2016-07-12 00:09:34 +00:00
Morris Jobke
d15fd5cb96 Change occurence of ownCloud (#352) 2016-07-11 13:49:19 +02:00
Nextcloud bot
67278d12e1
[tx-robot] updated from transifex 2016-07-11 00:09:22 +00:00
Nextcloud bot
4aae157087
[tx-robot] updated from transifex 2016-07-10 00:09:23 +00:00
Nextcloud bot
c108d816ac
[tx-robot] updated from transifex 2016-07-09 00:09:16 +00:00
Robin Appelman
d0e6fdba4d
combine if statements 2016-07-08 12:36:15 +02:00
Robin Appelman
039f730700
handle errors while getting fileinfo 2016-07-08 12:36:07 +02:00
Robin Appelman
f98cb9efa0
Fix type hinting 2016-07-08 12:35:50 +02:00
Robin Appelman
951ff0897c
hint global handlebars 2016-07-08 12:35:33 +02:00
Robin Appelman
f0b9eba9c2
dont overwrite a variable with a different type 2016-07-08 12:35:23 +02:00
Nextcloud bot
a84250e0af [tx-robot] updated from transifex 2016-07-08 00:09:25 +00:00
Lukas Reschke
2a1a3957b6 Merge pull request #333 from nextcloud/sync-master
Sync master
2016-07-07 19:29:43 +02:00
Morris Jobke
beae00a5e5 Simplify test code and don't show anything if no date is set 2016-07-07 15:10:04 +02:00
Morris Jobke
43b26b9506 add unit tests 2016-07-07 15:10:04 +02:00
Morris Jobke
059cc1f22e Update header during update callback 2016-07-07 15:10:03 +02:00
Morris Jobke
c809db86f5 Not set expiration date is represented as 0 2016-07-07 15:10:03 +02:00
Morris Jobke
ab3c8d4de9 add "Never" if expiration date is not set 2016-07-07 15:10:03 +02:00
Morris Jobke
b5dea82e45 Add expiration date to share by link view 2016-07-07 15:10:03 +02: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
4a0efa38c0 [tx-robot] updated from transifex 2016-07-07 08:58:00 +00:00
Jenkins for ownCloud
38718bf89e [tx-robot] updated from transifex 2016-07-07 01:56:27 -04:00
Nextcloud bot
da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Thomas Müller
d2d99a91a0 fix swift primary object store test (#25281)
* Wait for socket to be open

* Fix call on null

* Allow DB access for MountProviderTest

Makes unit tests pass when using object store, since their FS access is
actually oc_filecache DB access. It is currently not possible to mock
or bypass the logic from "SharedMount::verifyMountPoint()" triggered by
this test.
2016-07-05 08:54:51 +02:00
Jenkins for ownCloud
9e0d8fcf41 [tx-robot] updated from transifex 2016-07-04 01:56:34 -04:00
Jenkins for ownCloud
dea7b5be35 [tx-robot] updated from transifex 2016-07-02 01:54:53 -04:00
Lukas Reschke
179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Jenkins for ownCloud
2b0f053126 [tx-robot] updated from transifex 2016-06-29 05:52:18 -04:00
Robin Appelman
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
Robin Appelman
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
Lukas Reschke
6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +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
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
Vincent Petry
ec968a48e4
Increase fed share timeout from 3 to 10 + unit tests 2016-06-22 10:29:40 +02:00
Joas Schilling
3e763ac81e
Add timeouts to make the UI usable again when a remote share is unreachable 2016-06-22 10:29:40 +02:00
Jenkins for ownCloud
b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
Thomas Müller
f2f1eab7f4 fix broken unit test (#25198) 2016-06-21 13:55:11 +02:00
Vincent Petry
ca168265ef Filter out group shares for owner where owner is included (#25190) 2016-06-21 11:36:28 +02:00
Lukas Reschke
2b493e2f9d
Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-21 11:18:22 +02:00
Robin Appelman
bb465a7ab4 Catch exceptions while creating shared mounts (#25077) 2016-06-20 22:11:05 +02:00
Vincent Petry
c1770d746d Merge pull request #25159 from owncloud/share-app-initorder
Delay files_sharing's registerMountProviders
2016-06-20 13:31:36 +02:00
Vincent Petry
a636078e6c
Make getShareFolder use given view instead of static FS 2016-06-17 11:11:59 +02:00
Vincent Petry
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
Robin Appelman
4f02bd1dff disable cleanFolder for the federated share storage 2016-06-14 17:29:09 +02:00
Jenkins for ownCloud
5887afbb37 [tx-robot] updated from transifex 2016-06-14 08:02:15 +02:00
Lukas Reschke
01f8434a75 Merge pull request #57 from nextcloud/fdrop-template
smaller files drop fixes
2016-06-13 00:14:34 +02:00
Arthur Schiwon
42c66efea5
Merge branch 'master' of https://github.com/owncloud/core into downstream-160611 2016-06-11 15:34:43 +02:00
Arthur Schiwon
ca43c49709
smaller files drop fixes
* fix infinite spinner on blacklisted files
* move HTML to template
* indentation
2016-06-11 15:15:37 +02:00
Lukas Reschke
842cc2a788 Merge pull request #19 from nextcloud/files-drop
add "hide file list" option
2016-06-10 18:29:09 +02:00
Vincent Petry
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
Lukas Reschke
54e2ac5713
Add text about uploaded files 2016-06-10 14:47:40 +02:00
Jenkins for ownCloud
e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Lukas Reschke
c49402d266
Add some error handling 2016-06-09 21:44:54 +02:00
Lukas Reschke
c268ad1597
Add PHP unit test 2016-06-09 18:29:13 +02:00
Lukas Reschke
e878e786e0
Fix public upload for normal shares 2016-06-09 18:12:58 +02:00
Lukas Reschke
6e99b0f59d
Make uploading possible via select and cleanup CSS 2016-06-09 17:55:26 +02:00
Lukas Reschke
5fdde426eb
Add fancy layout 2016-06-09 17:55:26 +02:00
Lukas Reschke
53ba111e21
Fix XSS 2016-06-09 15:15:17 +02:00
Lukas Reschke
075bf73c80
Prevent access to shareinfo if share if read-only 2016-06-09 15:15:17 +02:00
Bjoern Schiessle
bb54ab0db8
add hide file list option 2016-06-09 15:15:17 +02:00
Roeland Jago Douma
b0dd0634e3
Bring back sharedstorage hooks 2016-06-09 14:00:02 +02:00
Robin Appelman
e7a55c4fef
handle path not being set in shared cache (#24993) 2016-06-09 13:59:59 +02:00
Jenkins for ownCloud
355f50bd6c [tx-robot] updated from transifex 2016-06-09 06:16:41 +00:00
Roeland Jago Douma
4a3c67fdb4
Bring back sharedstorage hooks 2016-06-08 08:19:32 +02:00
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